diff options
| author | Stephan Groß | 2013-03-01 16:52:07 +0100 |
|---|---|---|
| committer | Stephan Groß | 2013-03-01 16:52:07 +0100 |
| commit | aa16db90422eeff90ff1818e66c7a956d73b8a25 (patch) | |
| tree | c995fd2885994446150be88e2c3c212ed1b3587d /rest_framework/fields.py | |
| parent | 4a2788a7be6541811977fbe7ae31af41bf9545a4 (diff) | |
| parent | d20089c8d18e04dec03c3836b47b4436945d0a85 (diff) | |
| download | django-rest-framework-aa16db90422eeff90ff1818e66c7a956d73b8a25.tar.bz2 | |
Merge branch 'datevalidation_2' of https://github.com/minddust/django-rest-framework into datevalidation_2
Conflicts:
rest_framework/tests/filterset.py
Diffstat (limited to 'rest_framework/fields.py')
0 files changed, 0 insertions, 0 deletions