mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-09-02 21:02:41 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source 
Conflicts:
	phpBB/composer.lock
This commit is contained in:
Marc Alexander
2016-06-20 21:24:46 +02:00
parent 1dc622e921 597e7163c0
commit 155d24107a
9 changed files with 327 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/composer.json
View File

@@ -52,6 +52,7 @@
"require-dev": {
"fabpot/goutte": "~2.0",
"facebook/webdriver": "~1.1",
"laravel/homestead": "~2.2",
"phing/phing": "2.4.*",
"phpunit/dbunit": "1.3.*",
"phpunit/phpunit": "4.1.*",