Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
jheld committed Aug 4, 2018
2 parents 03d55c1 + 11b0b1d commit 917d4de
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
9 changes: 0 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ language: python

python:
- '2.7'
- '3.3'
- '3.4'
- '3.5'
- '3.6'
Expand Down Expand Up @@ -30,14 +29,6 @@ matrix:
env: DJANGO="django>=2.0,<2.1"
- python: "pypy"
env: DJANGO="django>=2.0,<2.1"
- python: "3.3"
env: DJANGO="django>=1.9,<1.10"
- python: "3.3"
env: DJANGO="django>=1.10,<1.11"
- python: "3.3"
env: DJANGO="django>=1.11,<2"
- python: "3.3"
env: DJANGO="django>=2.0,<2.1"
- python: "3.6"
env: DJANGO="django>=1.8,<1.9"
- python: "3.6"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

# Basic package information:
name='django-twilio',
version='0.9.0',
version='0.9.1',
packages=find_packages(),

# Packaging options:
Expand Down

0 comments on commit 917d4de

Please sign in to comment.