diff options
| author | Markus Törnqvist | 2013-05-18 13:19:52 +0300 |
|---|---|---|
| committer | Markus Törnqvist | 2013-05-18 13:24:36 +0300 |
| commit | 85faebbb75e65b89c3b6e6103943d4bf6ca0b2c1 (patch) | |
| tree | 779a469e6643c376a11cd5e7a5cc4136d35d5d77 /rest_framework/tests/reverse.py | |
| parent | b950b025bc66e3018d5f74e1494ff17f7742be75 (diff) | |
| parent | 5d7d51ed9d24e98eaa2d34592db1781d1ea3230f (diff) | |
| download | django-rest-framework-85faebbb75e65b89c3b6e6103943d4bf6ca0b2c1.tar.bz2 | |
Merge branch 'mikee2185-master' into mjtorn-master
Conflicts:
rest_framework/fields.py
rest_framework/serializers.py
rest_framework/tests/models.py
rest_framework/tests/serializer.py
Fixed all the conflicts.
Diffstat (limited to 'rest_framework/tests/reverse.py')
0 files changed, 0 insertions, 0 deletions