Merge remote-tracking branch 'upstream/master' into rebar3

cmeiklejohn · cmeiklejohn · commit bd59c2241e46 · 2015-10-21T16:03:21.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -10,4 +10,5 @@ script:
   - make test
 notifications:
   email: christopher.meiklejohn@gmail.com
+  email: tom@helium.com
 sudo: false

-Original file line number
+Diff line change
   - make test
 notifications:
   email: [email protected]
 +  email: [email protected]
 sudo: false