Merge branch 'master' into dev-feng

2015-09-28 22:14:55 +08:00 · 2015-09-28 22:14:55 +08:00 · 11ce5d59bb
parent 5076301a82 8f8039fe2b
commit 11ce5d59bb
1 changed files with 1 additions and 0 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -6,3 +6,4 @@ otp_release:
 script: 
  - make
 sudo: false