diff options
| author | Tom Christie | 2014-12-18 12:24:16 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-12-18 12:24:16 +0000 |
| commit | 4ea140291635bde9f5e9d271d5101ec6624e51bb (patch) | |
| tree | ae62221ba7d09b46296ba52d0060e07d1cd70cb5 /tests/conftest.py | |
| parent | c8d88c8c8a594e3b66547a34462db4766292ea9e (diff) | |
| parent | b8bdf812c14a287fda211810a72b53d4e671b6b2 (diff) | |
| download | django-rest-framework-4ea140291635bde9f5e9d271d5101ec6624e51bb.tar.bz2 | |
Merge master
Diffstat (limited to 'tests/conftest.py')
0 files changed, 0 insertions, 0 deletions