Merge branch '1.1.x'

doctrine · Jan 12, 2013 · 6c6e2cf · 6c6e2cf
2 parents 7d3cf70 + 78b3680
commit 6c6e2cf
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,10 @@ language: php
 php:
   - 5.3
   - 5.4
+  - 5.5
 
-before_script: composer install --dev
+matrix:
+  allow_failures:
+    - php: 5.5
 
+before_script: composer install --dev --prefer-source