Brandon Taylor 34e5d62245 Fixed merge conflict.		2014-12-22 10:30:56 -05:00
..
__init__.py	Added SortableForeignKey field to replace `sortable_by` model property.	2012-02-24 22:35:30 -06:00
admin.py	Merged pull request 97	2014-12-22 10:25:35 -05:00
models.py	Fixed merge conflict.	2014-12-22 10:30:56 -05:00
tests.py	Added Python 3 compatibility to sample project.	2014-11-19 10:58:55 -05:00