Merge branch '1.1.x'

doctrine · Oct 6, 2014 · dfe39f8 · dfe39f8
2 parents df9f5d5 + 9cb57e4
commit dfe39f8
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