makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 04:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'ticket/14538' into ticket/14538-3.2.x

Browse source
This commit is contained in:
Marc Alexander 2016-03-15 13:30:50 +01:00
commit 67d58aa7b8
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/composer.lock generated
View file

@ -1300,6 +1300,10 @@
"ircmaxell/password-compat": "~1.0", "ircmaxell/password-compat": "~1.0",
"php": ">=5.3.3" "php": ">=5.3.3"
}, },
"require-dev": {
"symfony/debug": "~2.7",
"symfony/phpunit-bridge": "~2.7"
},
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
@ -2727,7 +2731,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.0.x-dev" "dev-master": "2.x-dev"
} }
}, },
"autoload": { "autoload": {