Bruno Alla 6efab67b79 Merge remote-tracking branch 'carljm/master' into feature/soft-delete-purge ... # Conflicts: # model_utils/tests/tests.py		2016-11-28 23:31:16 +00:00
..
locale/de/LC_MESSAGES	Add script and makefile tasks for making and compiling messages; un-gitignore .mo files.	2015-07-20 10:20:11 -06:00
tests	Merge remote-tracking branch 'carljm/master' into feature/soft-delete-purge	2016-11-28 23:31:16 +00:00
__init__.py	Bump version to 2.6.1.a1.	2016-09-19 08:05:40 -06:00
choices.py	Merge branch 'master' into fix-choices-deepcopy	2013-10-11 13:23:56 -06:00
fields.py	Remove defered fields in _save_initial only for Django 1.10+	2016-11-18 23:31:45 +00:00
managers.py	Add SoftDeletableModel	2016-09-12 15:11:34 +02:00
models.py	Add a purge_from_db to SoftDeletableModel	2016-11-17 08:56:59 +00:00
tracker.py	Support Django 1.10 deferred FileField with FieldTracker	2016-09-08 18:00:48 +03:00