aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2013-06-24 13:40:05 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2013-06-24 13:40:05 -0500
commita61dd78fc953db2a90b1aa62263a797764cf8bba (patch)
tree6f6777aeeddfd0c6fcdfb557fc78ba6b01a697f3
parent309ed5e5c32cb334986b53ca855e26dd483c2919 (diff)
downloadforums-a61dd78fc953db2a90b1aa62263a797764cf8bba.tar
forums-a61dd78fc953db2a90b1aa62263a797764cf8bba.tar.gz
forums-a61dd78fc953db2a90b1aa62263a797764cf8bba.tar.bz2
forums-a61dd78fc953db2a90b1aa62263a797764cf8bba.tar.xz
forums-a61dd78fc953db2a90b1aa62263a797764cf8bba.zip
[feature/twig] Change composer to load Twig 1.13.*
PHPBB3-11598
-rw-r--r--phpBB/composer.json2
-rw-r--r--phpBB/composer.lock2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/composer.json b/phpBB/composer.json
index c31d721301..a114d5c0e0 100644
--- a/phpBB/composer.json
+++ b/phpBB/composer.json
@@ -7,7 +7,7 @@
"symfony/http-kernel": "2.1.*",
"symfony/routing": "2.1.*",
"symfony/yaml": "2.1.*",
- "twig/twig": "1.*"
+ "twig/twig": "1.13.*"
},
"require-dev": {
"fabpot/goutte": "v0.1.0",
diff --git a/phpBB/composer.lock b/phpBB/composer.lock
index 1c4bc4988d..a20c6303ee 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": "bd651ccd1316ecdc6d72a22357d8c46f",
+ "hash": "e4a4f4848a7201d7e044446001afda29",
"packages": [
{
"name": "symfony/config",