Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-11-02 03:16:04 +01:00
Code Issues Packages Projects Releases Activity

Set Twig back to 1.24 until we can fix some issues

Browse Source
This commit is contained in:
Andy Miller
2016-09-30 09:02:49 -06:00
parent 9bd058e319
commit c3e74c2e09
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -7,7 +7,7 @@
"license": "MIT", "license": "MIT",
"require": { "require": {
"php": ">=5.5.9", "php": ">=5.5.9",
"twig/twig": "~1.24", "twig/twig": "~1.24.1",
"erusev/parsedown": "dev-master as 1.6.0", "erusev/parsedown": "dev-master as 1.6.0",
"erusev/parsedown-extra": "~0.7", "erusev/parsedown-extra": "~0.7",
"symfony/yaml": "~2.8", "symfony/yaml": "~2.8",

26
composer.lock generated
View File

@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "7a8caecbaedbf785d96b7437f296ca66", "hash": "e1593c6de95705ca30ed771b7162e488",
"content-hash": "2fec25b3b5d627c0896d5ee3030b6bed", "content-hash": "fe5d2907e02f2795bd1e69147c28f0a9",
"packages": [ "packages": [
{ {
"name": "antoligy/dom-string-iterators", "name": "antoligy/dom-string-iterators",
@@ -1245,16 +1245,16 @@
}, },
{ {
"name": "twig/twig", "name": "twig/twig",
"version": "v1.25.0", "version": "v1.24.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/twigphp/Twig.git", "url": "https://github.com/twigphp/Twig.git",
"reference": "f16a634ab08d87e520da5671ec52153d627f10f6" "reference": "33093f6e310e6976baeac7b14f3a6ec02f2d79b7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/f16a634ab08d87e520da5671ec52153d627f10f6", "url": "https://api.github.com/repos/twigphp/Twig/zipball/33093f6e310e6976baeac7b14f3a6ec02f2d79b7",
"reference": "f16a634ab08d87e520da5671ec52153d627f10f6", "reference": "33093f6e310e6976baeac7b14f3a6ec02f2d79b7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1267,7 +1267,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.25-dev" "dev-master": "1.24-dev"
} }
}, },
"autoload": { "autoload": {
@@ -1302,7 +1302,7 @@
"keywords": [ "keywords": [
"templating" "templating"
], ],
"time": "2016-09-21 23:05:12" "time": "2016-09-01 17:50:53"
} }
], ],
"packages-dev": [ "packages-dev": [
@@ -1831,16 +1831,16 @@
}, },
{ {
"name": "phpdocumentor/reflection-docblock", "name": "phpdocumentor/reflection-docblock",
"version": "3.1.0", "version": "3.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
"reference": "9270140b940ff02e58ec577c237274e92cd40cdd" "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd", "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e",
"reference": "9270140b940ff02e58ec577c237274e92cd40cdd", "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1872,7 +1872,7 @@
} }
], ],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
"time": "2016-06-10 09:48:41" "time": "2016-09-30 07:12:33"
}, },
{ {
"name": "phpdocumentor/type-resolver", "name": "phpdocumentor/type-resolver",