Merge branch 'datevalidation_2' of https://github.com/minddust/django-rest-framework into datevalidation_2

Browse Source

Conflicts:
	rest_framework/tests/filterset.py

...

This commit is contained in:

Stephan Groß 2013-03-01 16:52:07 +01:00

parent 4a2788a7be d20089c8d1

commit aa16db9042

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available