From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 11 Oct 2016 13:08:51 +0000 (+0200)
Subject: Merge branch 'dev' into prestashop
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7d6fc0fd96f89d2e511885d770fc1f5adaae8baf;p=mezzo.git

Merge branch 'dev' into prestashop

Conflicts:
	requirements-dev.txt
---

7d6fc0fd96f89d2e511885d770fc1f5adaae8baf
diff --cc app/organization/core/management/commands/festival-sync-eve-events.py
index 070cadbd,070cadbd..9ece332c
--- a/app/organization/core/management/commands/festival-sync-eve-events.py
+++ b/app/organization/core/management/commands/festival-sync-eve-events.py
@@@ -23,6 -23,6 +23,7 @@@ class Command(BaseCommand)
            )
  
      default_user = User.objects.get(username='admin')
++    
  
      def cleanup(self):
          # for event in ma_models.Event.objects.all():