Jeremy Stretch f31d6c55be Fix erroneous merge conflict resolution from v2.5.11

2019-04-29 14:57:28 -04:00

..

__init__.py

…

customfields.py

Closes #2614: Simplify calls of super() for Python 3

2018-11-27 10:52:24 -05:00

nested_serializers.py

Closes #2578: Reorganized nested serializers

2018-11-12 11:36:44 -05:00

serializers.py

Merge branch 'develop' into develop-2.6

2019-04-09 14:11:26 -04:00

urls.py

Closes #1792 - Add CustomFieldChoices API endpoint (#2941)

2019-03-04 15:58:40 -05:00

views.py

Fix erroneous merge conflict resolution from v2.5.11

2019-04-29 14:57:28 -04:00