Merge pull request #51 from togusafish/tachikoma/update-20150818164321

Exec tachikoma update 20150818164321
tyabe · Aug 21, 2015 · bfb8a8c · bfb8a8c
2 parents 8919dc4 + 83bbfdc
commit bfb8a8c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -92,7 +92,7 @@ GEM
       slop (~> 3.4)
     pry-padrino (0.1.2)
       pry (>= 0.8)
-    puma (2.12.3)
+    puma (2.13.4)
     pusher (0.14.5)
       httpclient (~> 2.5)
       multi_json (~> 1.0)
@@ -143,7 +143,7 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
-    tins (1.5.4)
+    tins (1.6.0)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)