Pablo Martín feb36f8fce Merge branch 'master' of https://github.com/litchfield/django-multiselectfield into get_display ... Conflicts: multiselectfield/db/fields.py		2014-10-13 16:16:06 +02:00
..
__init__.py	Move multiselectfile app to parent folder	2013-12-04 16:44:19 +01:00
fields.py	Merge branch 'master' of https://github.com/litchfield/django-multiselectfield into get_display	2014-10-13 16:16:06 +02:00