Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12417] Revert "No longer allow Travis CI HHVM environment to fail."
This commit is contained in:
Joas Schilling 2014-04-16 22:48:04 +02:00
commit 67debc790d

View file

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