diff options
| author | Xavier Ordoquy | 2014-05-01 08:01:38 +0200 |
|---|---|---|
| committer | Xavier Ordoquy | 2014-05-01 08:01:38 +0200 |
| commit | 7b4463f73983e36f228e6af0ff8c921d4698a9b3 (patch) | |
| tree | c26fd01425a3754e65a0b2c48694ca734278745f /.travis.yml | |
| parent | 2aca69a94601858a462060bc55154c812f70fb91 (diff) | |
| parent | c9e6f31166ebccc5c3bf2f27e12a6d6c87f5cf22 (diff) | |
| download | django-rest-framework-7b4463f73983e36f228e6af0ff8c921d4698a9b3.tar.bz2 | |
Merge remote-tracking branch 'reference/2.4.0' into feature/pytest
Conflicts:
rest_framework/runtests/urls.py
tests/test_response.py
tox.ini
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index d2f20e2b..44597d9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ env: - DJANGO="django==1.6.3" - DJANGO="django==1.5.6" - DJANGO="django==1.4.11" - - DJANGO="django==1.3.7" install: - pip install $DJANGO @@ -36,10 +35,5 @@ matrix: env: DJANGO="https://www.djangoproject.com/download/1.7b2/tarball/" - python: "3.2" env: DJANGO="django==1.4.11" - - python: "3.2" - env: DJANGO="django==1.3.7" - python: "3.3" env: DJANGO="django==1.4.11" - - python: "3.3" - env: DJANGO="django==1.3.7" - |