diff options
| author | Tom Christie | 2014-12-03 23:11:04 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-12-03 23:11:04 +0000 |
| commit | af23ec36bbf4ccb8f4179e790b49b11677ccf6ee (patch) | |
| tree | 7ea80a203cc8718150cd55e4403f3f4771160281 /tox.ini | |
| parent | 3a5b3772fefc3c2f2c0899947cbc07bfe6e6b5d2 (diff) | |
| parent | 0cc990792c63caa8fa8fea62cea53b0d28157b55 (diff) | |
| download | django-rest-framework-af23ec36bbf4ccb8f4179e790b49b11677ccf6ee.tar.bz2 | |
Merge branch 'jpadilla-oauth_as_package' into version-3.1
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -16,10 +16,6 @@ deps = 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 - {py26,py27}-django{14,15,16}: django-oauth-plus==2.2.1 - {py26,py27}-django{14,15}: django-oauth2-provider==0.2.3 - {py26,py27}-django16: django-oauth2-provider==0.2.4 pytest-django==2.6.1 django-filter==0.7 defusedxml==0.3 |