diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a83f9a6e..4f0e06e1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,15 @@ +# v1.7.0-rc.6 +## mm/dd/2020 + +1. [](#bugfix) + * Regression: fatal error in blueprints [#2811](https://github.com/getgrav/grav/issues/2811) + # v1.7.0-rc.5 ## 02/03/2020 1. [](#bugfix) * Regression: Flex not working in PHP 7.2 or older - * Fixed creating first user from admin not clearing Flex User directory cache + * Fixed creating first user from admin not clearing Flex User directory cache [#2809](https://github.com/getgrav/grav/issues/2809) * Fixed Flex Pages allowing root page to be deleted # v1.7.0-rc.4 diff --git a/composer.json b/composer.json index 7f298aa04..d15eb23c1 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ "gregwar/image": "2.*", "donatj/phpuseragentparser": "~0.10", "pimple/pimple": "~3.2", - "rockettheme/toolbox": "~1.5", + "rockettheme/toolbox": "dev-develop", "maximebf/debugbar": "~1.0", "league/climate": "^3.4", "antoligy/dom-string-iterators": "^1.0", diff --git a/composer.lock b/composer.lock index d008219d6..8eb0197a0 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": "c8b230b285ee0b8b86c56f5eac7b6214", + "content-hash": "2153c072ac373551a2141b2bb23c180c", "packages": [ { "name": "antoligy/dom-string-iterators", @@ -1840,16 +1840,16 @@ }, { "name": "rockettheme/toolbox", - "version": "1.5.0", + "version": "dev-develop", "source": { "type": "git", "url": "https://github.com/rockettheme/toolbox.git", - "reference": "f8d877b29856a42c8b21b2e12c8bec0012987314" + "reference": "61dd04de40a90b7f398cca2cc8807ea297e78dae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rockettheme/toolbox/zipball/f8d877b29856a42c8b21b2e12c8bec0012987314", - "reference": "f8d877b29856a42c8b21b2e12c8bec0012987314", + "url": "https://api.github.com/repos/rockettheme/toolbox/zipball/61dd04de40a90b7f398cca2cc8807ea297e78dae", + "reference": "61dd04de40a90b7f398cca2cc8807ea297e78dae", "shasum": "" }, "archive": { @@ -1904,10 +1904,10 @@ "rockettheme" ], "support": { - "source": "https://github.com/rockettheme/toolbox/tree/1.5.0", + "source": "https://github.com/rockettheme/toolbox/tree/develop", "issues": "https://github.com/rockettheme/toolbox/issues" }, - "time": "2020-02-03T16:49:48+00:00" + "time": "2020-02-04T08:43:37+00:00" }, { "name": "seld/cli-prompt", @@ -5807,6 +5807,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { + "rockettheme/toolbox": 20, "itsgoingd/clockwork": 10, "victorjonsson/markdowndocs": 20 },