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

This commit is contained in:
Andy Miller
2019-05-03 10:43:17 -06:00
2 changed files with 3 additions and 3 deletions

View File

@@ -24,7 +24,7 @@
"kodus/psr7-server": "*",
"nyholm/psr7": "^1.0",
"twig/twig": "~1.4",
"twig/twig": "~1.40",
"erusev/parsedown": "1.6.4",
"erusev/parsedown-extra": "~0.7",
"symfony/yaml": "~4.2",

4
composer.lock generated
View File

@@ -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": "ab11f03dcee35ae50dcb26f9973b8cd9",
"content-hash": "f9429e7cd2e75a232f968b01a1024983",
"packages": [
{
"name": "antoligy/dom-string-iterators",
@@ -2021,7 +2021,7 @@
},
{
"name": "Gert de Pagter",
"email": "BackEndTea@gmail.com"
"email": "backendtea@gmail.com"
}
],
"description": "Symfony polyfill for ctype functions",