Merge branch 'master' of git.framasoft.org:Chill-project/Main

Conflicts:
	.gitlab-ci.yml
This commit is contained in:
Julien Fastré 2015-10-17 00:42:49 +02:00
commit 65d32de3ce

View File

@ -10,7 +10,6 @@ before_script:
- php Tests/Fixtures/App/console doctrine:migrations:migrate --env=test --no-interaction
- php Tests/Fixtures/App/console doctrine:fixtures:load --env=test --no-interaction
test:php-5.6:
stage: test
script: phpunit --testdox