From: Ludovic CHEVALIER Date: Tue, 24 Dec 2013 17:04:45 +0000 (+0100) Subject: Merge branch 'master' of ateliers.heureux-cyclage.org:lhc/ateliers X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=commitdiff_plain;h=aea9e28a65a85d9bdaec714338e9b146ab00c9c5;hp=3f52abe4e7994a925232ac61c2ea72df20c347b4 Merge branch 'master' of ateliers.heureux-cyclage.org:lhc/ateliers --- diff --git a/etc/gitolite b/etc/gitolite index 6f52334..132556f 160000 --- a/etc/gitolite +++ b/etc/gitolite @@ -1 +1 @@ -Subproject commit 6f52334daefc9bce6c2e09a5fdafe726f40b6c7b +Subproject commit 132556f65d436a37502040817318d429d16c2ca7 diff --git a/etc/sv/openerp7_burette/local.sh b/etc/sv/openerp7_burette/local.sh index 59cc38b..793ff6b 100644 --- a/etc/sv/openerp7_burette/local.sh +++ b/etc/sv/openerp7_burette/local.sh @@ -78,6 +78,7 @@ for addon in \ no_db_management \ pos_membership \ remembership \ + cyclofficine_angouleme \ cyclofficine_ivry \ cyclofficine_paris_est \ dynamo \