Merge branch 'master' into issue_220

collective · May 31, 2013 · cc30f68 · cc30f68
2 parents 8749ba3 + 0e8e184
commit cc30f68
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,8 +5,8 @@ env:
   - PLONE_VERSION=4.3 QA=true
 matrix:
   allow_failures:
-  - python: 2.7
-  - env: PLONE_VERSION=4.2
+    - python: 2.7
+      env: PLONE_VERSION=4.2
 install:
   - sed -ie "s#travis-4.x.cfg#travis-$PLONE_VERSION.x.cfg#" travis.cfg
   - test "$PLONE_VERSION" = "4.2" && sed -ie "s#collective.js.jqueryui = 1.10.1.2#collective.js.jqueryui = 1.8.16.9#" versions.cfg || true