Merge branch '3.0.x'

Conflicts:
	.travis.yml

Duplicate testing on Symfony 2.6 is removed (it is already done by the
normal testing as it is the latest stable), and testing on 2.4 is
removed again because it is EOLed.
This commit is contained in:
Christophe Coevoet 2014-12-17 14:25:15 +01:00
commit f3e31e613e

View file

@ -10,12 +10,8 @@ matrix:
include:
- php: 5.5
env: SYMFONY_VERSION='2.3.*'
- php: 5.5
env: SYMFONY_VERSION='2.4.*'
- php: 5.5
env: SYMFONY_VERSION='2.5.*'
- php: 5.5
env: SYMFONY_VERSION='2.6.*'
before_script:
- /usr/share/elasticsearch/bin/elasticsearch -v