Merge branch 'master' into experimental

2014-11-03 21:18:50 +11:00 · 2014-11-03 21:18:50 +11:00 · 225754ae12
commit 225754ae12
parent 6f230de01c 5deeae1aa2
1 changed files with 4 additions and 0 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -3,6 +3,10 @@ node_js:
  - "0.10"
  - "0.11"

+branches:
+  except:
+   - experimental
+
 before_script: "npm install -g codeclimate-test-reporter"
 script: "make test-travis"