Merge branch '1.1' into 1.2

This commit is contained in:
William DURAND 2013-01-11 21:48:22 +01:00
commit b4f0898b12

View file

@ -9,9 +9,6 @@ matrix:
allow_failures:
- php: 5.5
env:
- SYMFONY_VERSION=origin/master
before_script:
- curl -s http://getcomposer.org/installer | php
- php composer.phar --dev install