Merge remote-tracking branch 'origin/master'

SciML · Oct 20, 2017 · d46d242 · d46d242
2 parents f9ddaf5 + 0181795
commit d46d242
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@
 language: julia
 os:
   - linux
-  - osx
+#  - osx
 julia:
   - 0.6
   - nightly

diff --git a/REQUIRE b/REQUIRE
@@ -1,5 +1,5 @@
 julia 0.6.0
-DiffEqBase 1.24.0
+DiffEqBase 1.24.1
 Parameters 0.5.0
 ForwardDiff 0.5.0 0.6.0
 GenericSVD 0.0.2