diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-08-23 15:21:40 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-08-23 15:21:40 +0200 |
| commit | e0be660e162d5b789b77ddb5c69ea5b93f8b3dc8 (patch) | |
| tree | f3c5f542e7589134014927a6b82a1162e36dc919 /phpBB | |
| parent | 942705e6c619d9e7676e5f0123f7a8dcd1be8b45 (diff) | |
| parent | b802732167959e409fd87f9c4c4da5b4a427c865 (diff) | |
| download | forums-e0be660e162d5b789b77ddb5c69ea5b93f8b3dc8.tar forums-e0be660e162d5b789b77ddb5c69ea5b93f8b3dc8.tar.gz forums-e0be660e162d5b789b77ddb5c69ea5b93f8b3dc8.tar.bz2 forums-e0be660e162d5b789b77ddb5c69ea5b93f8b3dc8.tar.xz forums-e0be660e162d5b789b77ddb5c69ea5b93f8b3dc8.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/14099] Fix the assets
[ticket/14099] Make composer.phar executable again
[ticket/14099] Fix tests
[ticket/14099] Update twig/twig to 1.20.0
[ticket/14099] Update composer.phar
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/composer.lock | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 16058b448c..15d3e8a7ff 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -1,7 +1,7 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://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", "This file is @generated automatically" ], "hash": "94d0f6dab53f11dab1de63c0ae519ee6", @@ -1061,25 +1061,25 @@ }, { "name": "twig/twig", - "version": "v1.18.0", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "4cf7464348e7f9893a93f7096a90b73722be99cf" + "reference": "1ea4e5f81c6d005fe84d0b38e1c4f1955eb86844" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/4cf7464348e7f9893a93f7096a90b73722be99cf", - "reference": "4cf7464348e7f9893a93f7096a90b73722be99cf", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/1ea4e5f81c6d005fe84d0b38e1c4f1955eb86844", + "reference": "1ea4e5f81c6d005fe84d0b38e1c4f1955eb86844", "shasum": "" }, "require": { - "php": ">=5.2.4" + "php": ">=5.2.7" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-master": "1.20-dev" } }, "autoload": { @@ -1114,7 +1114,7 @@ "keywords": [ "templating" ], - "time": "2015-01-25 17:32:08" + "time": "2015-08-12 15:56:39" } ], "packages-dev": [ |