Use mezzanine master branch

diff --git a/app/organization/pages/admin.py b/app/organization/pages/admin.py
index e0ae08e764aa08917966e0762e7c1b3661a24fe2..3b3441bf2023d0622f264f8021d02554b6a6e18e 100644 (file)
--- a/app/organization/pages/admin.py
+++ b/app/organization/pages/admin.py
@@ -15,11 +15,13 @@ class DynamicContentHomeSliderInline(StackedDynamicInlineAdmin):
     model = DynamicContentHomeSlider
     form = DynamicContentHomeSliderForm
 
+
 class DynamicContentHomeBodyInline(StackedDynamicInlineAdmin):
 
     model = DynamicContentHomeBody
     form = DynamicContentHomeBodyForm
 
+
 class HomeAdminDisplayable(BaseTranslationModelAdmin):
 
     inlines = [DynamicContentHomeSliderInline, DynamicContentHomeBodyInline  ]

diff --git a/app/organization/pages/forms.py b/app/organization/pages/forms.py
index 8b5e9735b8f23299ab429c969b91ffaba21f9cb8..80cbf52f1cd9f0c2acf2984c656be68fca7b6173 100644 (file)
--- a/app/organization/pages/forms.py
+++ b/app/organization/pages/forms.py
@@ -24,6 +24,7 @@ class DynamicContentHomeSliderForm(autocomplete.FutureModelForm):
         model = DynamicContentHomeSlider
         fields = ('__all__')
 
+
 class DynamicContentHomeBodyForm(autocomplete.FutureModelForm):
 
     content_object = dal_queryset_sequence.fields.QuerySetSequenceModelField(

diff --git a/requirements-dev.txt b/requirements-dev.txt
index ab15f0e446c89f7dbf4e9a3062d8b20dc7379b4c..7e7d273b2d26e731ae9f03ad5767f4af79238f45 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,5 +1,5 @@
 -e git+https://github.com/yomguy/mezzanine-agenda.git#egg=mezzanine-agenda-0.2.2
--e git+https://github.com/yomguy/mezzanine.git@9917784#egg=mezzanine-4.2-dev
+-e git+https://github.com/yomguy/mezzanine.git@master#egg=mezzanine-4.2-dev
 -e git+https://github.com/stephenmcd/grappelli-safe.git@dynamic_stacked#egg=grappelli-safe-0.4.2
 #-e git+https://github.com/yourlabs/django-autocomplete-light.git#egg=django-autocomplete-light
 #https://forge.ircam.fr/p/django-eve/source/download/dev/