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

Merge branch 'task/sami' into task/sami-ascraeus

Browse Source 
* task/sami:
  [task/sami] Replace phpdoctor with sami.
  [task/sami] Add sami/sami as a composer development dependency.

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
This commit is contained in:
Andreas Fischer
2014-05-16 18:13:45 +02:00
parent a496015b98 f08f283143
commit 9cea96ad4e
5 changed files with 255 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/composer.json
View File

@@ -19,6 +19,7 @@
"phpunit/dbunit": "1.3.*",
"phpunit/phpunit": "4.1.*",
"phing/phing": "2.4.*",
"sami/sami": "1.*",
"squizlabs/php_codesniffer": "1.*"
}
}