Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11324] PHP 5.5 is in RC stage. No longer allow failure on travis.
This commit is contained in:
Nils Adermann 2013-05-09 20:16:32 +02:00
commit c583d9f5e7

View file

@ -9,10 +9,6 @@ env:
- DB=mysql
- DB=postgres
matrix:
allow_failures:
- php: 5.5
before_script:
- sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi"
- sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi"