Merge remote-tracking branch 'origin/master' into dev-branch

jsilvax · jsilvax · commit 1218c9fc8f53 · 2018-06-28T12:23:07.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,7 @@ cache:
 branches:
   only:
     - master
+    - dev-branch
 notifications:
   email: false
 before_script:
