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

This commit is contained in:
Matias Griese
2017-12-12 12:45:14 +02:00

View File

@@ -6,6 +6,7 @@
"homepage": "http://getgrav.org",
"license": "MIT",
"require": {
"roave/security-advisories": "dev-master",
"php": ">=5.5.9",
"twig/twig": "~1.24",
"erusev/parsedown": "~1.6",
@@ -41,6 +42,11 @@
"fzaninotto/faker": "^1.5",
"victorjonsson/markdowndocs": "dev-master"
},
"config": {
"platform": {
"php": "5.5.9"
}
},
"repositories": [
{
"type": "vcs",