Merge branch '3.1.x'

* 3.1.x:
  [ticket/13657] Run travis builds on PHP 7.0
This commit is contained in:
Andreas Fischer 2015-03-05 15:42:49 +01:00
commit 3166d9126c

View file

@ -20,9 +20,12 @@ matrix:
env: DB=mysqli env: DB=mysqli
- php: 5.6 - php: 5.6
env: DB=mysqli env: DB=mysqli
- php: 7.0
env: DB=mysqli
- php: hhvm - php: hhvm
env: DB=mysqli env: DB=mysqli
allow_failures: allow_failures:
- php: 7.0
- php: hhvm - php: hhvm
fast_finish: true fast_finish: true