diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-10-08 12:16:54 +0200 |
|---|---|---|
| committer | Nicofuma <github@nicofuma.fr> | 2015-02-03 13:34:53 +0100 |
| commit | e1f983d3cf56794af21ade73ec24b502cc21cc06 (patch) | |
| tree | 5e3d9c06bfc5bb3fe85052ffc513ca3d247f6def /phpBB | |
| parent | 7e91320995fcc9f4abe299a05edcc3b3535ecf14 (diff) | |
| download | forums-e1f983d3cf56794af21ade73ec24b502cc21cc06.tar forums-e1f983d3cf56794af21ade73ec24b502cc21cc06.tar.gz forums-e1f983d3cf56794af21ade73ec24b502cc21cc06.tar.bz2 forums-e1f983d3cf56794af21ade73ec24b502cc21cc06.tar.xz forums-e1f983d3cf56794af21ade73ec24b502cc21cc06.zip | |
[ticket/13139] Update Twig to 1.16.2
PHPBB3-13139
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/composer.json | 2 | ||||
| -rw-r--r-- | phpBB/composer.lock | 21 |
2 files changed, 14 insertions, 9 deletions
diff --git a/phpBB/composer.json b/phpBB/composer.json index 4d31eefa2b..6f813f00d9 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -36,7 +36,7 @@ "symfony/routing": "2.5.*", "symfony/twig-bridge": "2.5.*", "symfony/yaml": "2.5.*", - "twig/twig": "1.13.*" + "twig/twig": "1.*" }, "require-dev": { "fabpot/goutte": "1.0.*", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 62e7c83272..1391ff164c 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -3,7 +3,7 @@ "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" ], - "hash": "2faf4ba24774c0d51cff4b78d4a81a68", + "hash": "372e66644eb8d1504f88471de6d6dac6", "packages": [ { "name": "lusitanian/oauth", @@ -910,16 +910,16 @@ }, { "name": "twig/twig", - "version": "v1.13.2", + "version": "v1.16.2", "source": { "type": "git", - "url": "https://github.com/fabpot/Twig.git", - "reference": "6d6a1009427d1f398c9d40904147bf9f723d5755" + "url": "https://github.com/twigphp/Twig.git", + "reference": "42f758d9fe2146d1f0470604fc05ee43580873fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Twig/zipball/6d6a1009427d1f398c9d40904147bf9f723d5755", - "reference": "6d6a1009427d1f398c9d40904147bf9f723d5755", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/42f758d9fe2146d1f0470604fc05ee43580873fc", + "reference": "42f758d9fe2146d1f0470604fc05ee43580873fc", "shasum": "" }, "require": { @@ -928,7 +928,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.16-dev" } }, "autoload": { @@ -951,6 +951,11 @@ "name": "Armin Ronacher", "email": "armin.ronacher@active-4.com", "role": "Project Founder" + }, + { + "name": "Twig Team", + "homepage": "https://github.com/fabpot/Twig/graphs/contributors", + "role": "Contributors" } ], "description": "Twig, the flexible, fast, and secure template language for PHP", @@ -958,7 +963,7 @@ "keywords": [ "templating" ], - "time": "2013-08-03 15:35:31" + "time": "2014-10-17 12:53:44" } ], "packages-dev": [ |