From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 26 Sep 2016 14:39:34 +0000 (+0200)
Subject: Merge branch 'dev' into prestashop
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1f2d2766ea824984033d8d0f4e0ea8091c1f63c8;p=mezzo.git

Merge branch 'dev' into prestashop

Conflicts:
	app/settings.py
	lib/django-eve
---

1f2d2766ea824984033d8d0f4e0ea8091c1f63c8
diff --cc app/settings.py
index 3129ad9f,2231530d..58da1f2d
--- a/app/settings.py
+++ b/app/settings.py
@@@ -217,16 -221,15 +221,15 @@@ INSTALLED_APPS = 
      "mezzanine.blog",
      "mezzanine.forms",
      # "mezzanine.galleries",
++    # "mezzanine.mobile",
      "mezzanine.twitter",
      "mezzanine.accounts",
-     # "mezzanine.mobile",
      "cartridge.shop",
 -    # "mezzanine.mobile",
 -    # "eve",
 +    "eve",
 +    "prestashop",
      'djangobower',
      "meta",
      "mezzanine_agenda",
--#    "orderable",
      "organization.core",
      "organization.media",
      "organization.pages",