Merge remote-tracking branch 'origin/master'

WyriHaximus · Apr 12, 2015 · 510b376 · 510b376
2 parents 9a7edf2 + 90b4cb5
commit 510b376
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,7 @@ php:
 
 matrix:
   allow_failures:
+    - php: 7
     - php: hhvm-nightly
     - php: 7