Merge branch '0.9.X' into develop

[philo.git] / philo / contrib / julian / models.py

diff --git a/philo/contrib/julian/models.py b/philo/contrib/julian/models.py
index 550513c..62b938a 100644 (file)
--- a/philo/contrib/julian/models.py
+++ b/philo/contrib/julian/models.py
@@ -17,7 +17,8 @@ from django.utils.encoding import force_unicode
 from philo.contrib.julian.feedgenerator import ICalendarFeed
 from philo.contrib.penfield.models import FeedView, FEEDS
 from philo.exceptions import ViewCanNotProvideSubpath
-from philo.models import Tag, Entity, Page, TemplateField
+from philo.models import Tag, Entity, Page
+from philo.models.fields import TemplateField
 from philo.utils import ContentTypeRegistryLimiter