Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/12147] Remove Travis CI notifications.

Conflicts:
	.travis.yml
This commit is contained in:
Nils Adermann 2014-02-02 16:27:28 +01:00
commit 8a6b961c54

View file

@ -33,13 +33,6 @@ script:
- 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:
- php: hhvm