diff options
| author | Tom Christie | 2014-12-03 23:15:06 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-12-03 23:15:06 +0000 |
| commit | cd4d8660211e7af3b06986b68a9281be0b8ffacf (patch) | |
| tree | 02ac4a1680a1080353f3f63854f11ad6968c00a5 /runtests.py | |
| parent | 6369f9212588c849c0ade41c135d229bfbe4a5cf (diff) | |
| parent | f74e52b31ee7645e032e684855fc1ca2860d75f6 (diff) | |
| download | django-rest-framework-cd4d8660211e7af3b06986b68a9281be0b8ffacf.tar.bz2 | |
Merge branch 'jpadilla-jsonp' into version-3.1
Diffstat (limited to 'runtests.py')
0 files changed, 0 insertions, 0 deletions