Merge branch 'master' of github.com:sigurdga/django-jquery-file-upload

sigurdga · sigurdga · commit 988082356c72 · 2013-08-10T19:34:17.000+02:00
Conflicts:
	fileupload/urls.py
diff --git a/fileupload/urls.py b/fileupload/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from fileupload.views import PictureCreateView, PictureDeleteView
 
 urlpatterns = patterns('',

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from django.conf.urls.defaults import patterns, url`
	`1`	`+from django.conf.urls import patterns, url`
`2`	`2`	`from fileupload.views import PictureCreateView, PictureDeleteView`
`3`	`3`
`4`	`4`	`urlpatterns = patterns('',`