Merge remote-tracking branch 'frewsxcv/patch-1' into feature/python34

160fbbee · Xavier Ordoquy · eb15c25b · 8ecb778c · 160fbbee
Commit 160fbbee authored May 16, 2014 by Xavier Ordoquy
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletions

.travis.yml
+5 -1

No files found.
--- 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"