Commit graph

2 commits

Author SHA1 Message Date
Andrews Medina
3c7fc0fc0e Merge branch 'develop' into admin_view
Conflicts:
	djadmin2/types.py
2013-07-26 17:55:55 -03:00
Daniel Greenfeld
038313c81c merge 2013-07-06 18:33:44 +02:00
Renamed from example/blog/tests/test_auth_admin.py (Browse further)