diff options
| author | Tom Christie | 2013-12-23 09:48:59 +0000 |
|---|---|---|
| committer | Tom Christie | 2013-12-23 09:48:59 +0000 |
| commit | 52686420f4bf866064ee88a15903665f14289394 (patch) | |
| tree | 41ea7b0d4863092f996f63de14e678a1c74a7a3a /tox.ini | |
| parent | 9c41c007afc71c899306bcb02e40bdfc36b09146 (diff) | |
| parent | 83b31e7ea298a8948e9a76c9b971845ea0052b3c (diff) | |
| download | django-rest-framework-52686420f4bf866064ee88a15903665f14289394.tar.bz2 | |
Merge branch 'bennbollay-patch-1' into 2.4.0
Conflicts:
.travis.yml
docs/api-guide/routers.md
rest_framework/compat.py
tox.ini
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -22,7 +22,7 @@ basepython = python2.7 deps = Django==1.6.1 django-filter==0.6a1 defusedxml==0.3 - django-oauth-plus==2.0 + django-oauth-plus==2.2.1 oauth2==1.5.211 django-oauth2-provider==0.2.4 django-guardian==1.1.1 @@ -32,7 +32,7 @@ basepython = python2.6 deps = Django==1.6.1 django-filter==0.6a1 defusedxml==0.3 - django-oauth-plus==2.0 + django-oauth-plus==2.2.1 oauth2==1.5.211 django-oauth2-provider==0.2.4 django-guardian==1.1.1 @@ -54,7 +54,7 @@ basepython = python2.7 deps = django==1.5.5 django-filter==0.6a1 defusedxml==0.3 - django-oauth-plus==2.0 + django-oauth-plus==2.2.1 oauth2==1.5.211 django-oauth2-provider==0.2.3 django-guardian==1.1.1 @@ -64,7 +64,7 @@ basepython = python2.6 deps = django==1.5.5 django-filter==0.6a1 defusedxml==0.3 - django-oauth-plus==2.0 + django-oauth-plus==2.2.1 oauth2==1.5.211 django-oauth2-provider==0.2.3 django-guardian==1.1.1 @@ -74,7 +74,7 @@ basepython = python2.7 deps = django==1.4.10 django-filter==0.6a1 defusedxml==0.3 - django-oauth-plus==2.0 + django-oauth-plus==2.2.1 oauth2==1.5.211 django-oauth2-provider==0.2.3 django-guardian==1.1.1 @@ -84,7 +84,7 @@ basepython = python2.6 deps = django==1.4.10 django-filter==0.6a1 defusedxml==0.3 - django-oauth-plus==2.0 + django-oauth-plus==2.2.1 oauth2==1.5.211 django-oauth2-provider==0.2.3 django-guardian==1.1.1 |