From ca9dba137233bc344e36a7685e96ea124d345a29 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Wed, 20 Jun 2018 10:57:57 +0300
Subject: [PATCH 1/2] Move wrongly placed items in changelog to the latest
 release

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93342d1dd..fe3329ddc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@
     * Fix classes on non-http based protocol links [#2034](https://github.com/getgrav/grav/issues/2034)
     * Fixed crash on IIS (Windows) with open_basedir in effect [#2053](https://github.com/getgrav/grav/issues/2053)
     * Fixed incorrect routing with setup.php based base [#1892](https://github.com/getgrav/grav/issues/1892)
+    * Fixed image resource memory deallocation [#2045](https://github.com/getgrav/grav/pull/2045)
+    * Fixed issue with Errors `display:` option not handling integers properly [admin#1452](https://github.com/getgrav/grav-plugin-admin/issues/1452)
 
 # v1.4.5
 ## 05/15/2018
@@ -21,7 +23,6 @@
     * Fixed an issue with some users getting **2FA** prompt after upgrade [admin#1442](https://github.com/getgrav/grav-plugin-admin/issues/1442)
     * Do not crash when generating URLs with arrays as parameters [#2018](https://github.com/getgrav/grav/pull/2018)
     * Utils::truncateHTML removes whitespace when generating summaries [#2004](https://github.com/getgrav/grav/pull/2004)
-    * Fixed issue with Errors `display:` option not handling integers properly [admin#1452](https://github.com/getgrav/grav-plugin-admin/issues/1452)
     
 # v1.4.4
 ## 05/11/2018

From d72eca7fb5a245a3356e3fee3ff7680ce31a274b Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Wed, 20 Jun 2018 11:11:46 +0300
Subject: [PATCH 2/2] Force Rockettheme/Toolbox to version 1.3.* in Grav 1.4
 series

---
 composer.json |  2 +-
 composer.lock | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 9918530bf..25c2a7ea9 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
         "gregwar/image": "2.*",
         "donatj/phpuseragentparser": "~0.3",
         "pimple/pimple": "~3.2",
-        "rockettheme/toolbox": "~1.3",
+        "rockettheme/toolbox": "~1.3.9",
         "maximebf/debugbar": "~1.10",
         "ext-mbstring": "*",
         "ext-openssl": "*",
diff --git a/composer.lock b/composer.lock
index cb8fe4129..ce312c9fd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c71dffc7daccd08aba7a52a476569d4c",
+    "content-hash": "5d9e73f7f63897aa224d4878c5fb0df3",
     "packages": [
         {
             "name": "antoligy/dom-string-iterators",
@@ -1203,16 +1203,16 @@
         },
         {
             "name": "rockettheme/toolbox",
-            "version": "1.4.0",
+            "version": "1.3.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rockettheme/toolbox.git",
-                "reference": "ca12fcc980dc7bdf3f955beb74278a070448a485"
+                "reference": "1deea4b45e09f6e0c3e6e075e175e50d05ccbf70"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rockettheme/toolbox/zipball/ca12fcc980dc7bdf3f955beb74278a070448a485",
-                "reference": "ca12fcc980dc7bdf3f955beb74278a070448a485",
+                "url": "https://api.github.com/repos/rockettheme/toolbox/zipball/1deea4b45e09f6e0c3e6e075e175e50d05ccbf70",
+                "reference": "1deea4b45e09f6e0c3e6e075e175e50d05ccbf70",
                 "shasum": ""
             },
             "require": {
@@ -1229,7 +1229,6 @@
                 "psr-4": {
                     "RocketTheme\\Toolbox\\ArrayTraits\\": "ArrayTraits/src",
                     "RocketTheme\\Toolbox\\Blueprints\\": "Blueprints/src",
-                    "RocketTheme\\Toolbox\\Compat\\": "Compat/src",
                     "RocketTheme\\Toolbox\\DI\\": "DI/src",
                     "RocketTheme\\Toolbox\\Event\\": "Event/src",
                     "RocketTheme\\Toolbox\\File\\": "File/src",
@@ -1248,7 +1247,7 @@
                 "php",
                 "rockettheme"
             ],
-            "time": "2018-06-13T17:11:52+00:00"
+            "time": "2018-03-09T00:03:18+00:00"
         },
         {
             "name": "seld/cli-prompt",