Merge branch 'add_osx_ci' into dev

enkessler · Feb 9, 2017 · e34c94c · e34c94c
2 parents 61a83b0 + 21fd093
commit e34c94c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,7 @@
+os:
+  - linux
+  - osx
+
 rvm:
   - 1.9.3
   - jruby