Merge branch 'feature/3601'

Close zendframework/zendframework#3601
zendframework · Jan 29, 2013 · 8ddf6b3 · 8ddf6b3
commit 8ddf6b3
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,11 @@ php:
   - 5.3.3
   - 5.3
   - 5.4
+  - 5.5
+
+matrix:
+  allow_failures:
+    - php: 5.5
 
 before_install:
  - cp tests/TestConfiguration.php.travis tests/TestConfiguration.php