makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source 
* 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
This commit is contained in:
Tristan Darricau 2015-08-23 15:21:40 +02:00
commit e0be660e16
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
composer.phar
View file

Binary file not shown.

16
phpBB/composer.lock generated
View file

@ -1,7 +1,7 @@
{ {
"_readme": [ "_readme": [
"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 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" "This file is @generated automatically"
], ],
"hash": "94d0f6dab53f11dab1de63c0ae519ee6", "hash": "94d0f6dab53f11dab1de63c0ae519ee6",
@ -1061,25 +1061,25 @@
}, },
{ {
"name": "twig/twig", "name": "twig/twig",
"version": "v1.18.0", "version": "v1.20.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/twigphp/Twig.git", "url": "https://github.com/twigphp/Twig.git",
"reference": "4cf7464348e7f9893a93f7096a90b73722be99cf" "reference": "1ea4e5f81c6d005fe84d0b38e1c4f1955eb86844"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/4cf7464348e7f9893a93f7096a90b73722be99cf", "url": "https://api.github.com/repos/twigphp/Twig/zipball/1ea4e5f81c6d005fe84d0b38e1c4f1955eb86844",
"reference": "4cf7464348e7f9893a93f7096a90b73722be99cf", "reference": "1ea4e5f81c6d005fe84d0b38e1c4f1955eb86844",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.2.4" "php": ">=5.2.7"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.18-dev" "dev-master": "1.20-dev"
} }
}, },
"autoload": { "autoload": {
@ -1114,7 +1114,7 @@
"keywords": [ "keywords": [
"templating" "templating"
], ],
"time": "2015-01-25 17:32:08" "time": "2015-08-12 15:56:39"
} }
], ],
"packages-dev": [ "packages-dev": [