From 6caf89383eb01d06ba0bd140d3588b9517340af4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Sat, 17 Oct 2015 00:38:41 +0200
Subject: [PATCH] Merging update from framagit (creating gitlab-ci)

Conflicts:
	.gitlab-ci.yml
---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a977dc9a2..c9d6daacb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,9 +10,11 @@ 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
 test:php-7:
    stage: test
-   script: phpunit --testdox
\ No newline at end of file
+   script: phpunit --testdox
+