Update to latest twig

This commit is contained in:
Romain Neutron
2013-10-31 13:23:26 +01:00
parent 36f7b24f26
commit fa88305bfe
2 changed files with 8 additions and 8 deletions

View File

@@ -37,7 +37,7 @@
"symfony/symfony" : "2.3.3", "symfony/symfony" : "2.3.3",
"alchemy-fr/tcpdf-clone" : "~6.0", "alchemy-fr/tcpdf-clone" : "~6.0",
"themattharris/tmhoauth" : "~0.7", "themattharris/tmhoauth" : "~0.7",
"twig/twig" : "~1.13.0", "twig/twig" : "~1.14, >=1.14.2",
"twig/extensions" : "~1.0", "twig/extensions" : "~1.0",
"zend/gdata" : "~1.12.1" "zend/gdata" : "~1.12.1"
}, },

14
composer.lock generated
View File

@@ -3,7 +3,7 @@
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
], ],
"hash": "7c844fa6bef5e861c16a13b1dc9eca37", "hash": "55c5aaf5173cac55c8869a159830a3d5",
"packages": [ "packages": [
{ {
"name": "alchemy-fr/tcpdf-clone", "name": "alchemy-fr/tcpdf-clone",
@@ -2868,16 +2868,16 @@
}, },
{ {
"name": "twig/twig", "name": "twig/twig",
"version": "v1.13.2", "version": "v1.14.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/fabpot/Twig.git", "url": "https://github.com/fabpot/Twig.git",
"reference": "6d6a1009427d1f398c9d40904147bf9f723d5755" "reference": "ca445842fcea4f844d68203ffa2d00f5e3cdea64"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/fabpot/Twig/zipball/6d6a1009427d1f398c9d40904147bf9f723d5755", "url": "https://api.github.com/repos/fabpot/Twig/zipball/ca445842fcea4f844d68203ffa2d00f5e3cdea64",
"reference": "6d6a1009427d1f398c9d40904147bf9f723d5755", "reference": "ca445842fcea4f844d68203ffa2d00f5e3cdea64",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -2886,7 +2886,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.13-dev" "dev-master": "1.14-dev"
} }
}, },
"autoload": { "autoload": {
@@ -2913,7 +2913,7 @@
"keywords": [ "keywords": [
"templating" "templating"
], ],
"time": "2013-08-03 15:35:31" "time": "2013-10-30 08:20:53"
}, },
{ {
"name": "zend/gdata", "name": "zend/gdata",