diff options
| author | Xavier Ordoquy | 2014-04-30 22:24:01 +0200 |
|---|---|---|
| committer | Xavier Ordoquy | 2014-04-30 22:24:01 +0200 |
| commit | 2aca69a94601858a462060bc55154c812f70fb91 (patch) | |
| tree | 86f4d926344bea677ff8dd56505332fc16fdecc8 /tests/test_testing.py | |
| parent | c5f68fba0638a15fa3c802f1bafc664e890611dc (diff) | |
| parent | d8fb81ceb15afe09a50584afcc466de812d30046 (diff) | |
| download | django-rest-framework-2aca69a94601858a462060bc55154c812f70fb91.tar.bz2 | |
Merge remote-tracking branch 'reference/master' into feature/pytest
Conflicts:
tests/test_serializer.py
Diffstat (limited to 'tests/test_testing.py')
0 files changed, 0 insertions, 0 deletions