Skip to content

Commit

Permalink
Merge branch 'release/5.1.1__2'
Browse files Browse the repository at this point in the history
  • Loading branch information
dyve committed Jan 23, 2015
2 parents 59b25a7 + 80b8129 commit 2494cf3
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ python:

# Django versions for matrix
env:
- DJANGO_VERSION=1.4.16
- DJANGO_VERSION=1.5.11
- DJANGO_VERSION=1.6.8
- DJANGO_VERSION=1.7.1
- DJANGO_VERSION=1.4.18
- DJANGO_VERSION=1.5.12
- DJANGO_VERSION=1.6.10
- DJANGO_VERSION=1.7.3

# Command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
install:
Expand All @@ -28,19 +28,19 @@ script:
matrix:
exclude:
- python: "3.2"
env: DJANGO_VERSION=1.4.16
env: DJANGO_VERSION=1.4.18
- python: "3.3"
env: DJANGO_VERSION=1.4.16
env: DJANGO_VERSION=1.4.18
- python: "3.4"
env: DJANGO_VERSION=1.4.16
env: DJANGO_VERSION=1.4.18
- python: "3.2"
env: DJANGO_VERSION=1.5.11
env: DJANGO_VERSION=1.5.12
- python: "3.3"
env: DJANGO_VERSION=1.5.11
env: DJANGO_VERSION=1.5.12
- python: "3.4"
env: DJANGO_VERSION=1.5.11
env: DJANGO_VERSION=1.5.12
- python: "2.6"
env: DJANGO_VERSION=1.7.1
env: DJANGO_VERSION=1.7.3

# Report to coveralls
after_success:
Expand Down

0 comments on commit 2494cf3

Please sign in to comment.