From aa67bda82b99ef49c5b0db598902243ce6a4b5bc Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Wed, 15 Jul 2015 08:45:58 +0200
Subject: [PATCH] Update puma to version 2.12.0

---
 Gemfile.lock | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 099b4bd..c5e4933 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -116,8 +116,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    puma (2.11.3)
-      rack (>= 1.1, < 2.0)
+    puma (2.12.0)
     rack (1.6.4)
     rack-pjax (0.8.0)
       nokogiri (~> 1.5)