diff options
| author | Tom Christie | 2014-11-27 15:14:25 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-11-27 15:14:25 +0000 |
| commit | a88a37a8ceb8592114f6e14dcd61e26bf942a16b (patch) | |
| tree | e23b9714ebc9268262fb7c4b2e3fdd38e3b34870 | |
| parent | 8579222cbdff98aef50e244e179b7c32a76ce8ad (diff) | |
| parent | b73cc716663cf3b70687e0669f508c41d3a08b12 (diff) | |
| download | django-rest-framework-a88a37a8ceb8592114f6e14dcd61e26bf942a16b.tar.bz2 | |
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
| -rw-r--r-- | tox.ini | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -10,10 +10,10 @@ commands = ./runtests.py --fast setenv = PYTHONDONTWRITEBYTECODE=1 deps = - django14: django==1.4.11 - django15: django==1.5.6 - django16: Django==1.6.3 - django17: Django==1.7 + django14: Django==1.4.16 + django15: Django==1.5.11 + django16: Django==1.6.8 + django17: Django==1.7.1 djangomaster: https://github.com/django/django/zipball/master {py26,py27}-django{14,15,16,17}: django-guardian==1.2.3 {py26,py27}-django{14,15,16}: oauth2==1.5.211 |
