Merge branch 'master' into topic-101-vm-simple-linux

2017-04-24 14:35:48 -05:00 · 2017-04-24 14:35:48 -05:00 · 942c23a554
parent 938402edba ca65fe31ce
commit 942c23a554
1 changed files with 2 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -11,6 +11,7 @@ env:

 branches:
  only:
+  - master
  - /^(?i:topic)-.*$/

 # install terraform