Hopiu/django-admin2
1
0
Fork 0
mirror of https://github.com/jazzband/django-admin2.git synced 2026-04-30 19:44:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
django-admin2/djadmin2/templates
History
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
..
admin2/bootstrap Merge remote-tracking branch 'origin/develop' into inline-formsets 2013-05-22 00:58:53 +01:00