Merge branch '3.1' into 3.2

orchestral · Dec 4, 2015 · 3a9188c · 3a9188c
2 parents 10b8321 + aae80f3
commit 3a9188c
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -39,5 +39,4 @@ matrix:
   allow_failures:
     - env: setup=stable
     - env: setup=coveralls coverage=yes
-    - php: 7.0
   fast_finish: true