diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-05-09 20:16:32 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-05-09 20:16:32 +0200 |
| commit | c583d9f5e721764ef413512b8104b4873d807e7a (patch) | |
| tree | b10781d01ff662f722c7947fb7a6a5f9ff251619 | |
| parent | e043763905171e332a28098c4dc5005b2ef2d57c (diff) | |
| parent | b3479869232fd4f2e6c3f43e0d6e76ee08ab7d23 (diff) | |
| download | forums-c583d9f5e721764ef413512b8104b4873d807e7a.tar forums-c583d9f5e721764ef413512b8104b4873d807e7a.tar.gz forums-c583d9f5e721764ef413512b8104b4873d807e7a.tar.bz2 forums-c583d9f5e721764ef413512b8104b4873d807e7a.tar.xz forums-c583d9f5e721764ef413512b8104b4873d807e7a.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11324] PHP 5.5 is in RC stage. No longer allow failure on travis.
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 178f219db3..8039e1d47e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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" |