wagtail/wagtail/wagtailusers
Karl Hobley 67a069dbd3 Merge branch 'develop' into feature/user-account-settings
Conflicts:
	django-verdant/verdantadmin/templates/verdantadmin/home.html
	django-verdant/verdantadmin/urls.py
	django-wagtail/wagtail/wagtailadmin/templates/wagtailadmin/shared/main_nav.html
2014-01-28 16:03:49 +00:00
..
templates/wagtailusers move verdantusers app to django-wagtail package 2014-01-27 17:09:25 +00:00
views move verdantusers app to django-wagtail package 2014-01-27 17:09:25 +00:00
__init__.py move verdantusers app to django-wagtail package 2014-01-27 17:09:25 +00:00
forms.py Merge branch 'develop' into feature/user-account-settings 2014-01-28 16:03:49 +00:00
urls.py move verdantusers app to django-wagtail package 2014-01-27 17:09:25 +00:00