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

Merge branch 'develop-olympus' into develop

Browse Source 
# By Igor Wiedler (1) and others
* develop-olympus:
  [ticket/11671] Update composer.lock
  [ticket/11671] Add phing as a dependency and upgrade deps
  [ticket/11668] Move lint test to the end for travis

Conflicts:
	phpBB/composer.lock
This commit is contained in:
Nathaniel Guse
2013-07-13 10:28:02 -05:00
parent 1584fdd26d b1b37ddde2
commit fd10d97cb1
4 changed files with 63 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/composer.json
View File

@@ -12,6 +12,7 @@
"require-dev": {
"fabpot/goutte": "v0.1.0",
"phpunit/dbunit": "1.2.*",
"phpunit/phpunit": "3.7.*"
"phpunit/phpunit": "3.7.*",
"phing/phing": "2.4.*"
}
}