aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Ordoquy2014-05-16 00:33:49 +0200
committerXavier Ordoquy2014-05-16 00:33:49 +0200
commit160fbbee0c38f241d034c9127647f7700730bee9 (patch)
treecc6252d6756c7ae6a2291ccf29e4a3c95c80db1a
parenteb15c25ba1fbe26a0d5e018c04009d869e16f4c6 (diff)
parent8ecb778cd23d5d561f2e9f4a3561bb1647257a89 (diff)
downloaddjango-rest-framework-160fbbee0c38f241d034c9127647f7700730bee9.tar.bz2
Merge remote-tracking branch 'frewsxcv/patch-1' into feature/python34
-rw-r--r--.travis.yml6
1 files changed, 5 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index bd6d2539..0c9b4455 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ python:
- "2.7"
- "3.2"
- "3.3"
+ - "3.4"
env:
- DJANGO="https://www.djangoproject.com/download/1.7b2/tarball/"
@@ -41,4 +42,7 @@ matrix:
env: DJANGO="django==1.4.11"
- python: "3.3"
env: DJANGO="django==1.3.7"
-
+ - python: "3.4"
+ env: DJANGO="django==1.4.11"
+ - python: "3.4"
+ env: DJANGO="django==1.3.7"