Merge with master.

[redakcja.git] / apps / wiki_img / urls.py

diff --git a/apps/wiki_img/urls.py b/apps/wiki_img/urls.py
index 518da6b..6a516f3 100644 (file)
--- a/apps/wiki_img/urls.py
+++ b/apps/wiki_img/urls.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns('wiki_img.views',