From aa75bcb6b04c48a56dc5aa0d6084590d0e1ba87c Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Tue, 24 Sep 2013 11:07:06 +0200
Subject: [PATCH] Update puma

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index fcdcc460..5a69095f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -72,8 +72,8 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    puma (1.6.3)
-      rack (~> 1.2)
+    puma (2.6.0)
+      rack (>= 1.1, < 2.0)
     rack (1.5.2)
     rack-cache (1.2)
       rack (>= 0.4)