Hopiu/django-avatar
1
0
Fork 0
mirror of https://github.com/jazzband/django-avatar.git synced 2026-03-16 22:20:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' of github.com:jezdez/django-avatar

Browse source 
Conflicts:
	avatar/urls.py
	tests/settings.py
This commit is contained in:
Jannis Leidel 2013-08-01 13:13:28 +02:00
commit 5e2785e5a5
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
avatar/urls.py
View file

@ -1,6 +1,7 @@
try:
from django.conf.urls import patterns, url
except ImportError:
# Django < 1.4
from django.conf.urls.defaults import patterns, url
urlpatterns = patterns(