A Django content management system focused on flexibility and user experience
Find a file
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
wagtail Merge branch 'develop' into feature/user-account-settings 2014-01-28 16:03:49 +00:00
LICENSE Add an initially empty django-wagtail package 2014-01-22 12:27:23 +00:00
README.rst Add an initially empty django-wagtail package 2014-01-22 12:27:23 +00:00