Merge branch 'develop'

klen · Mar 18, 2016 · 56ac097 · 56ac097
2 parents 57baeff + fdba375
commit 56ac097
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,6 +1,6 @@
 [bumpversion]
 commit = True
-current_version = 5.5.0
+current_version = 5.5.1
 files = mixer/__init__.py
 tag = True
 tag_name = {new_version}

diff --git a/.travis.yml b/.travis.yml
@@ -3,13 +3,13 @@ language: python
 python: 2.7
 
 env:
-    - TOXENV=py26-d16
-    - TOXENV=py27-d16
     - TOXENV=py34-d16
     - TOXENV=py27-d17
     - TOXENV=py34-d17
     - TOXENV=py27-d18
     - TOXENV=py34-d18
+    - TOXENV=py27-d19
+    - TOXENV=py34-d19
     - TOXENV=cov
 
 branches:

diff --git a/mixer/__init__.py b/mixer/__init__.py
@@ -14,7 +14,7 @@
 # Module information
 # ==================
 
-__version__ = "5.5.0"
+__version__ = "5.5.1"
 __project__ = "mixer"
 __author__ = "horneds <horneds@gmail.com>"
 __license__ = "BSD"