Merge branch 'master' of https://github.com/Cardshifter/Cardshifter i…

…nto develop
Cardshifter · Sep 19, 2014 · c903fb2 · c903fb2
2 parents 828fc06 + baef78d
commit c903fb2
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,3 +22,5 @@ deploy:
   on:
     tags: true
     all_branches: true
+    #must remain on all_branches: true together with tags: true due to the following bug: https://github.com/travis-ci/travis-ci/issues/1675
+    #ideal situation would be to change it such that it only builds a release on the master branch on tag push