Merge branch '1.1' into 1.2
This commit is contained in:
commit
b4f0898b12
|
@ -9,9 +9,6 @@ matrix:
|
||||||
allow_failures:
|
allow_failures:
|
||||||
- php: 5.5
|
- php: 5.5
|
||||||
|
|
||||||
env:
|
|
||||||
- SYMFONY_VERSION=origin/master
|
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- curl -s http://getcomposer.org/installer | php
|
- curl -s http://getcomposer.org/installer | php
|
||||||
- php composer.phar --dev install
|
- php composer.phar --dev install
|
||||||
|
|
Loading…
Reference in a new issue