summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-02-03 09:26:23 -0800
committerJeff Forcier <jeff@bitprophet.org>2017-02-03 09:26:23 -0800
commit37a93e29297880be17be42053196d9be40bcb88a (patch)
tree5c619d0687335c343484fe63cf8b2293b1b1f0b1
parent03e5803055afca3069969cfde398d097f2ec1f9c (diff)
parent5c719c57b751b9661174e45590c2c3295e636e3e (diff)
Merge branch '2.0' into 2.1
-rw-r--r--.travis.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index af32ba7e..53b9dcf9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ python:
- "3.3"
- "3.4"
- "3.5"
+ - "3.6"
- "pypy-5.4.1"
install:
# Self-install for setup.py-driven deps