Carl Meyer 32aa781dc2 Merge branch 'master' into query-set-deprecated ... * master: Update tox.ini. Update runtests.py for compatibility with Django 1.7. Check for StatusModel field name conflicts correctly.		2014-01-06 16:06:31 -07:00
..
tests	Merge branch 'master' into query-set-deprecated	2014-01-06 16:06:31 -07:00
__init__.py	Bump version for dev.	2013-08-29 22:35:32 -06:00
choices.py	Merge branch 'master' into fix-choices-deepcopy	2013-10-11 13:23:56 -06:00
fields.py	Added choices_name parameter to StatusField	2013-11-14 16:12:31 -03:00
managers.py	backwards comptatible get_queryset, for Django < 1.6	2013-12-31 17:30:11 +01:00
models.py	Check for StatusModel field name conflicts correctly.	2014-01-06 16:03:44 -07:00
tracker.py	Merge pull request #73 from silonov/json_fields_support	2013-08-17 01:46:31 -07:00