Merge pull request #359 from fs/osx-10-11-compatibility

Update puma and libv8 to be compatible with osx 10.11
fs · Oct 9, 2015 · f921863 · f921863
2 parents 3096e3c + b21257a
commit f921863
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -187,7 +187,7 @@ GEM
       addressable (~> 2.3)
     letter_opener (1.2.0)
       launchy (~> 2.2)
-    libv8 (3.16.14.7)
+    libv8 (3.16.14.11)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
@@ -216,7 +216,7 @@ GEM
       slop (~> 3.4)
     pry-rails (0.3.2)
       pry (>= 0.9.10)
-    puma (2.13.4)
+    puma (2.14.0)
     pundit (1.0.0)
       activesupport (>= 3.0.0)
     quiet_assets (1.0.2)