aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2013-05-09 11:14:52 -0700
committerNils Adermann <naderman@naderman.de>2013-05-09 11:14:52 -0700
commitb3479869232fd4f2e6c3f43e0d6e76ee08ab7d23 (patch)
treed871b1a1a894443441b89783c881dce065cd96ff
parentf9325bfdeb74f8d4479b40c050063dde81aa2857 (diff)
parentd1415676c54138fecfe133a92bbf7aca52d3c2b7 (diff)
downloadforums-b3479869232fd4f2e6c3f43e0d6e76ee08ab7d23.tar
forums-b3479869232fd4f2e6c3f43e0d6e76ee08ab7d23.tar.gz
forums-b3479869232fd4f2e6c3f43e0d6e76ee08ab7d23.tar.bz2
forums-b3479869232fd4f2e6c3f43e0d6e76ee08ab7d23.tar.xz
forums-b3479869232fd4f2e6c3f43e0d6e76ee08ab7d23.zip
Merge pull request #1396 from bantu/ticket/11324
[ticket/11324] PHP 5.5 is in RC state. No longer allow failure on travis...
-rw-r--r--.travis.yml4
1 files changed, 0 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 093719528d..b08d677bc8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,10 +10,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"