Merge branch 'develop-olympus' into develop-ascraeus

* develop-olympus:
  [ticket/12417] Revert "No longer allow Travis CI HHVM environment to fail."
This commit is contained in:
Joas Schilling 2014-04-16 22:47:27 +02:00
commit 7f3aebd495

View file

@ -40,3 +40,5 @@ matrix:
env: DB=mariadb
- php: 5.4
env: DB=postgres
allow_failures:
- php: hhvm