From 822297e729f88a7fd6004af3b9dac8b46d0614ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 30 Jun 2015 14:42:46 +0200 Subject: [PATCH] set composer.json chill deps to master --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 5b884c8e4..8001d1474 100644 --- a/composer.json +++ b/composer.json @@ -27,8 +27,8 @@ "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/main": "dev-master@dev", + "chill-project/custom-fields": "dev-master@dev", "doctrine/doctrine-fixtures-bundle": "~2.2", "champs-libres/composer-bundle-migration": "~1.0", "doctrine/doctrine-migrations-bundle": "dev-master@dev",