From 03f1243cf71c4e9d502bf46d7fd93091bced9112 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 30 Jun 2015 14:34:55 +0200
Subject: [PATCH] set composer.json to master branches

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

diff --git a/composer.json b/composer.json
index 94ddfa0ce..197bef509 100644
--- a/composer.json
+++ b/composer.json
@@ -25,9 +25,9 @@
         "doctrine/orm": "~2.4",
         "doctrine/common": "~2.4",
         "doctrine/doctrine-bundle": "~1.2",
-        "chill-project/main": "dev-add_acl@dev",
-        "chill-project/custom-fields": "dev-add_acl@dev",
-        "chill-project/person": "dev-add_acl@dev",
+        "chill-project/main": "dev-master@dev",
+        "chill-project/custom-fields": "dev-master@dev",
+        "chill-project/person": "dev-master@dev",
         "champs-libres/composer-bundle-migration": "~1.0",
         "doctrine/doctrine-migrations-bundle": "dev-master@dev",
         "doctrine/migrations": "~1.0@dev"