Merge branch '1.0.x' into 1.1.x

doctrine · Oct 6, 2014 · 9cb57e4 · 9cb57e4
2 parents da61670 + 006f186
commit 9cb57e4
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,10 +6,6 @@ php:
   - 5.5
   - 5.6
 
-matrix:
-  allow_failures:
-    - php: 5.6
-
 env:
   - MONGO_VERSION=1.2.12
   - MONGO_VERSION=1.3.2