diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-02-02 16:27:28 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-02-02 16:27:28 +0100 |
| commit | 8a6b961c54ea117ada9a85044840975d050c91b7 (patch) | |
| tree | ef24669c0eb96c23107859d25c9047878bff7f61 | |
| parent | f8d6a07392f73bc7b85418a60047d761661a7657 (diff) | |
| parent | ed43436c185458c5b16974afea398aa4d18ccce6 (diff) | |
| download | forums-8a6b961c54ea117ada9a85044840975d050c91b7.tar forums-8a6b961c54ea117ada9a85044840975d050c91b7.tar.gz forums-8a6b961c54ea117ada9a85044840975d050c91b7.tar.bz2 forums-8a6b961c54ea117ada9a85044840975d050c91b7.tar.xz forums-8a6b961c54ea117ada9a85044840975d050c91b7.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/12147] Remove Travis CI notifications.
Conflicts:
.travis.yml
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index bfe58bee7d..9b6544e23f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,13 +32,6 @@ script: - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' -a '$DB' = 'mysql' ]; then ../phpBB/vendor/bin/phing sniff; fi" - cd .. - phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml - -notifications: - email: - recipients: - - dev-team@phpbb.com - on_success: change - on_failure: change matrix: allow_failures: |