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
..
wagtailadmin	Merge branch 'develop' into feature/user-account-settings	2014-01-28 16:03:49 +00:00
wagtailcore	Move verdantimages app to django-wagtail package	2014-01-28 12:32:16 +00:00
wagtaildocs	Merge branch 'develop' into feature/user-account-settings	2014-01-28 16:03:49 +00:00
wagtailimages	add reverse migration for verdantimages/0002_initial_data	2014-01-28 12:36:50 +00:00
wagtailsnippets	Move verdantsnippets app into django-wagtail package	2014-01-27 16:57:20 +00:00
wagtailusers	Merge branch 'develop' into feature/user-account-settings	2014-01-28 16:03:49 +00:00
__init__.py	Add an initially empty django-wagtail package	2014-01-22 12:27:23 +00:00