diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-05-09 19:42:13 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-05-09 19:42:13 +0200 |
| commit | 3327739290fe9d953a813fe8649605cee617d06b (patch) | |
| tree | 28d4b6da5a7843307df5802a66c98a67b9adb1d8 /phpBB/includes/diff/engine.php | |
| parent | dbb4a87b7945a35d9069283eed049a3a42f40bdf (diff) | |
| parent | 3fb536d7b7a51409a87192b2309ccf50ab11564f (diff) | |
| download | forums-3327739290fe9d953a813fe8649605cee617d06b.tar forums-3327739290fe9d953a813fe8649605cee617d06b.tar.gz forums-3327739290fe9d953a813fe8649605cee617d06b.tar.bz2 forums-3327739290fe9d953a813fe8649605cee617d06b.tar.xz forums-3327739290fe9d953a813fe8649605cee617d06b.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.
[ticket/11513] Update all CLI calls to phpunit to use vendor/bin.
[ticket/11513] Use PHPUnit from composer in .travis.yml.
[ticket/11513] Update (all) composer dependencies.
[ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.
Conflicts:
.travis.yml
phpBB/composer.lock
Diffstat (limited to 'phpBB/includes/diff/engine.php')
0 files changed, 0 insertions, 0 deletions