From 6ac74823895792f4804a90b24a642c2785c519e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 5 Jun 2015 10:59:19 +0200
Subject: [PATCH] switch to symfony 2.7 [ci skip]

---
 composer.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index f21b829f5..df02bd3e5 100644
--- a/composer.json
+++ b/composer.json
@@ -19,16 +19,16 @@
         "twig/extensions": "~1.0",
         "symfony/assetic-bundle": "~2.3",
         "symfony/monolog-bundle": "~2.4",
-        "symfony/framework-bundle": "2.5.*",
-        "symfony/yaml": "2.5.*",
-        "symfony/symfony": "2.5.*",
+        "symfony/framework-bundle": "~2.7",
+        "symfony/yaml": "~2.7",
+        "symfony/symfony": "~2.7",
         "doctrine/dbal": "~2.5",
         "doctrine/orm": "~2.4",
         "doctrine/common": "~2.4",
         "doctrine/doctrine-bundle": "~1.2",
-        "chill-project/main": "dev-master@dev",
-        "chill-project/custom-fields": "dev-master@dev",
-        "chill-project/person": "dev-master@dev",
+        "chill-project/main": "dev-add_acl@dev",
+        "chill-project/custom-fields": "dev-add_acl@dev",
+        "chill-project/person": "dev-add_acl@dev",
         "champs-libres/composer-bundle-migration": "~1.0",
         "doctrine/doctrine-migrations-bundle": "dev-master@dev",
         "doctrine/migrations": "~1.0@dev"