Andrew Ingram c625a80eaa Merge remote-tracking branch 'origin/master' into inline-formsets ... Conflicts: djadmin2/templates/admin2/bootstrap/model_edit_form.html		2013-05-19 19:17:51 +01:00
..
blog	Merge remote-tracking branch 'origin/master' into inline-formsets	2013-05-19 19:17:51 +01:00
example	Example project home page	2013-05-19 15:00:10 +02:00
__init__.py	Added testrunner that works with django	2013-05-18 15:30:32 +02:00
manage.py	Add example app	2013-05-18 12:12:57 +02:00