X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Furls.py;h=631c15ef9c7923b013718c56757d7d9d5e4b1992;hb=da026efdfa0421d8fddc77c2afb509a4fe4f1a8c;hp=0d0e1cce9f1e725edcd0ace8e092073268aea1fd;hpb=2a8e0a73ca07126470cca0fd845979f62693af8b;p=unfold.git

diff --git a/myslice/urls.py b/myslice/urls.py
index 0d0e1cce..631c15ef 100644
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -12,7 +12,12 @@ import components
 # admin.autodiscover()
 
 # to enable insert_above stuff
-from django.template.loader import add_to_builtins
+# add_to_builtins has changed location with django-1.7
+# also note this will probably go away some day
+try:
+    from django.template.loader import add_to_builtins
+except:
+    from django.template.base import add_to_builtins
 add_to_builtins('insert_above.templatetags.insert_tags')
 
 from settings import auxiliaries, INSTALLED_APPS