From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Mon, 27 Aug 2012 14:27:35 +0000 (+0200)
Subject: Merge branch 'search'
X-Git-Url: https://git.mdrn.pl/prawokultury.git/commitdiff_plain/fb2d5b78a90d3042f7eb5e8e419fcbe6e62fd00d?ds=sidebyside;hp=--cc

Merge branch 'search'
---

fb2d5b78a90d3042f7eb5e8e419fcbe6e62fd00d
diff --cc migdal/models.py
index 3e0a8a3,9a52fe2..97fbab3
--- a/migdal/models.py
+++ b/migdal/models.py
@@@ -6,12 -6,13 +6,13 @@@ from django.db import model
  from django.utils.translation import get_language, ugettext_lazy as _, ugettext
  from markupfield.fields import MarkupField
  from migdal.helpers import add_translatable
 -from migdal import settings
 +from migdal import app_settings
  
  
+ 
  class Category(models.Model):
      taxonomy = models.CharField(_('taxonomy'), max_length=32,
 -                    choices=settings.TAXONOMIES)
 +                    choices=app_settings.TAXONOMIES)
  
      class Meta:
          verbose_name = _('category')