Merge pull request #1068 from otzy007/puma3

puma updated to version 3
errbit · Feb 26, 2016 · 624c8a8 · 624c8a8
2 parents 4dd0ad8 + dc23feb
commit 624c8a8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -261,8 +261,8 @@ GEM
       pry (~> 0.10)
     pry-rails (0.3.4)
       pry (>= 0.9.10)
-    puma (2.15.3)
-    puma (2.15.3-java)
+    puma (3.0.1)
+    puma (3.0.1-java)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
     rack (1.6.4)