Merge branch 'develop' of github.com:getgrav/grav into 1.6

# Conflicts:
#	CHANGELOG.md
#	composer.json
#	composer.lock
#	system/defines.php
This commit is contained in:
Matias Griese
2019-03-25 18:56:09 +02:00
3 changed files with 14 additions and 1 deletions

View File

@@ -106,6 +106,7 @@ If you discover a possible security issue related to Grav or one of its plugins,
* Dive into more [advanced](https://learn.getgrav.org/advanced) functions
* Learn about the [Grav CLI](https://learn.getgrav.org/cli-console/grav-cli)
* Review examples in the [Grav Cookbook](https://learn.getgrav.org/cookbook)
* More [Awesome Grav Stuff](https://github.com/getgrav/awesome-grav)
# Backers
Support Grav with a monthly donation to help us continue development. [[Become a backer](https://opencollective.com/grav#backer)]