Merge branch 'master' into develop

# Conflicts: # .travis.yml
devopshq · Jan 9, 2018 · 01d60c4 · 01d60c4
2 parents 79e827b + ca03d8f
commit 01d60c4
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -22,7 +22,6 @@ deploy:
   on:
     branch: master
   skip_cleanup: true
-
 - provider: pypi
   user: devopshq
   password: