Andrew Ingram 05f69775b2 Merge remote-tracking branch 'origin/develop' into inline-formsets ... Conflicts: djadmin2/templates/admin2/bootstrap/model_add_form.html djadmin2/templates/admin2/bootstrap/model_edit_form.html djadmin2/views.py		2013-05-22 00:58:53 +01:00
..
static/themes/bootstrap	More style changes on model list	2013-05-19 14:29:29 +02:00
templates/admin2/bootstrap	Merge remote-tracking branch 'origin/develop' into inline-formsets	2013-05-22 00:58:53 +01:00
templatetags	rename admin2_urls to admin2_tags	2013-05-20 23:45:22 +01:00
tests	bike shedding	2013-05-21 00:25:38 +02:00
__init__.py	Prep for version 0.2.0	2013-05-19 17:23:58 +02:00
apiviews.py	Merge remote-tracking branch 'upstream/master' into rename-modeladmin-model_admin	2013-05-19 15:45:24 +02:00
core.py	PEP-8 before working on #99	2013-05-20 18:09:58 +02:00
forms.py	Rename package to djadmin2	2013-05-18 11:52:03 +02:00
models.py	Merge remote-tracking branch 'origin/develop' into inline-formsets	2013-05-21 00:11:28 +01:00
views.py	Merge remote-tracking branch 'origin/develop' into inline-formsets	2013-05-22 00:58:53 +01:00