Merge branch 'master' of github.com:froala/django-froala-editor

froala · Apr 4, 2016 · 5559197 · 5559197
2 parents 9ad016e + 54d7602
commit 5559197
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/froala_editor/urls.py b/froala_editor/urls.py
@@ -1,7 +1,7 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from froala_editor import views
 
-urlpatterns = patterns('',
-                       url(r'^image_upload/$', views.image_upload, name='froala_editor_image_upload'),
-                       url(r'^file_upload/$', views.file_upload, name='froala_editor_file_upload'),
-)
+urlpatterns = [
+    url(r'^image_upload/$', views.image_upload, name='froala_editor_image_upload'),
+    url(r'^file_upload/$', views.file_upload, name='froala_editor_file_upload'),
+]