diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-05-16 18:13:45 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-05-16 18:13:45 +0200 |
| commit | 9cea96ad4e79930381c82b0e429b70f725354728 (patch) | |
| tree | 3c56af9a6be061f349ccb8cd7425a1fb45656d1b /phpBB/composer.json | |
| parent | a496015b985105dff1daed26ad172a3601fbbbd9 (diff) | |
| parent | f08f283143823d0bbaad124e487cf57821ea70ab (diff) | |
| download | forums-9cea96ad4e79930381c82b0e429b70f725354728.tar forums-9cea96ad4e79930381c82b0e429b70f725354728.tar.gz forums-9cea96ad4e79930381c82b0e429b70f725354728.tar.bz2 forums-9cea96ad4e79930381c82b0e429b70f725354728.tar.xz forums-9cea96ad4e79930381c82b0e429b70f725354728.zip | |
Merge branch 'task/sami' into task/sami-ascraeus
* 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
Diffstat (limited to 'phpBB/composer.json')
| -rw-r--r-- | phpBB/composer.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/composer.json b/phpBB/composer.json index a55733b3c0..435d6139e4 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -19,6 +19,7 @@ "phpunit/dbunit": "1.3.*", "phpunit/phpunit": "4.1.*", "phing/phing": "2.4.*", + "sami/sami": "1.*", "squizlabs/php_codesniffer": "1.*" } } |