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

Merge branch '3.1.x'

Browse Source 
* 3.1.x:
  [ticket/13790] Update phpcs

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
This commit is contained in:
Nils Adermann
2015-05-30 10:58:40 +02:00
parent 3f4206e012 01073ffcbf
commit f958d05aed
22 changed files with 283 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/composer.json
View File

@@ -50,7 +50,7 @@
"phpunit/dbunit": "1.3.*",
"phpunit/phpunit": "4.1.*",
"sami/sami": "1.*",
"squizlabs/php_codesniffer": "1.*",
"squizlabs/php_codesniffer": "2.*",
"symfony/browser-kit": "2.8.*@dev",
"symfony/css-selector": "2.8.*@dev",
"symfony/debug": "2.8.*@dev",