Merge branch 'develop-olympus' into develop-ascraeus

* develop-olympus: [ticket/12417] Revert "No longer allow Travis CI HHVM environment to fail."
2025-04-21 00:02:18 +02:00 · 2014-04-16 22:47:27 +02:00 · 2014-04-16 22:47:27 +02:00 · 7f3aebd495
commit 7f3aebd495
parent b305364b27 d735129d6e
1 changed files with 2 additions and 0 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -40,3 +40,5 @@ matrix:
      env: DB=mariadb
    - php: 5.4
      env: DB=postgres
+  allow_failures:
+    - php: hhvm