Merge pull request #36 from tachikomapocket/tachikoma/update-20150414…

…164309 Exec tachikoma update 20150414164309
tyabe · Apr 14, 2015 · 6689755 · 6689755
2 parents 0674038 + 0c83a62
commit 6689755
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -46,7 +46,7 @@ GEM
     mime-types (1.25.1)
     mini_record (0.4.5)
       activerecord (>= 3.2.0)
-    minitest (5.5.1)
+    minitest (5.6.0)
     moneta (0.7.20)
     multi_json (1.11.0)
     netrc (0.10.3)
@@ -92,7 +92,7 @@ GEM
       slop (~> 3.4)
     pry-padrino (0.1.2)
       pry (>= 0.8)
-    puma (2.11.1)
+    puma (2.11.2)
       rack (>= 1.1, < 2.0)
     pusher (0.14.4)
       httpclient (~> 2.5)