From 02a355751c41b9b7f6f4488c87fa140ccab9a944 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 7 Jun 2020 19:43:16 -0600
Subject: [PATCH 1/4] Fix for deleting files from plugin configurations

Signed-off-by: Andy Miller <rhuk@mac.com>
---
 classes/adminbasecontroller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/adminbasecontroller.php b/classes/adminbasecontroller.php
index b2c9df71..e3828a55 100644
--- a/classes/adminbasecontroller.php
+++ b/classes/adminbasecontroller.php
@@ -943,7 +943,7 @@ class AdminBaseController
             $settings = (object)$blueprints->schema()->getProperty($field);
         } else {
             $page = null;
-            if ($type === 'themes') {
+            if ($type === 'themes' || $type === 'plugins') {
                 $obj = $this->grav[$type]->get(Utils::substrToString($blueprint, '/')); //here
                 $settings = (object) $obj->blueprints()->schema()->getProperty($field);
             } else {

From 8983414c4ce20cfc96805312d19e0453f60642d6 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Mon, 8 Jun 2020 12:32:58 -0600
Subject: [PATCH 2/4] fixes #2934

Signed-off-by: Andy Miller <rhuk@mac.com>
---
 CHANGELOG.md                                             | 2 ++
 .../templates/forms/fields/fieldset/fieldset.html.twig   | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 244f601d..db60af69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
 
 1. [](#improved)
     * Added `slug` and `type` to blueprints
+1. [](#bugfix)
+    * Support markdown in `fieldset.text` [#2934](https://github.com/getgrav/grav/issues/2934)
 
 # v1.9.13
 ## 03/05/2020
diff --git a/themes/grav/templates/forms/fields/fieldset/fieldset.html.twig b/themes/grav/templates/forms/fields/fieldset/fieldset.html.twig
index 9296a0b0..68885218 100644
--- a/themes/grav/templates/forms/fields/fieldset/fieldset.html.twig
+++ b/themes/grav/templates/forms/fields/fieldset/fieldset.html.twig
@@ -48,9 +48,12 @@
       >
 
           {% block group %}
-          {% if field.text %}
-          <p>{% if grav.twig.twig.filters['tu'] is defined %}{{ field.text|tu }}{% else %}{{ field.text|t }}{% endif %}
-          <p>
+              {% if field.text %}
+                {% if grav.twig.twig.filters['tu'] is defined %}
+                    {{ field.markdown ? field.text|tu|markdown : '<p>' ~ field.text|tu ~ '</p>' }}
+                {% else %}
+                    {{ field.markdown ? field.text|t|markdown : '<p>' ~ field.t ~ '</p>' }}
+                {% endif %}
               {% endif %}
 
               {% if field.fields %}

From d167673194252885debc4dafbcc377b8759585ed Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Mon, 8 Jun 2020 12:36:35 -0600
Subject: [PATCH 3/4] updated changelog

Signed-off-by: Andy Miller <rhuk@mac.com>
---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db60af69..64b3a2d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v1.9.15
+## mm/dd/2020
+
+1. [](#bugfix)
+    * Support markdown in `fieldset.text` [#2934](https://github.com/getgrav/grav/issues/2934)
+    * Fix data URLs in avatar images [#1889](https://github.com/getgrav/grav/issues/1889)
+    * Fix for deleting files in plugin configurations
+
 # v1.9.14
 ## 04/27/2020
 

From 1c5a2e7d665038a993a7e813bb40ee02e60a43fa Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Mon, 8 Jun 2020 12:44:04 -0600
Subject: [PATCH 4/4] space in font

Signed-off-by: Andy Miller <rhuk@mac.com>
---
 themes/grav/scss/fonts.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/grav/scss/fonts.scss b/themes/grav/scss/fonts.scss
index a690a8fd..23c21a01 100644
--- a/themes/grav/scss/fonts.scss
+++ b/themes/grav/scss/fonts.scss
@@ -3,7 +3,7 @@ $fonts-default: 'Roboto' !default;
 $fonts-mono: 'Inconsolata' !default;
 
 $font-definitions: (
-    Josefin+Slab: 400,
+    'Josefin Slab': '400',
     Roboto: '300,400,500',
     Inconsolata: '400,700'
 );