From 7f27b95d4c09f940c5537a1fb8f81edd38ba5204 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Mon, 7 Sep 2015 10:46:25 +0200
Subject: [PATCH] bump markerb

---
 Gemfile      | 2 +-
 Gemfile.lock | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index cd3158999..5f033043d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -121,7 +121,7 @@ gem "rails-i18n",           "4.0.4"
 
 # Mail
 
-gem "markerb",             "1.0.2"
+gem "markerb",             "1.1.0"
 gem "messagebus_ruby_api", "1.0.3"
 
 # Parsing
diff --git a/Gemfile.lock b/Gemfile.lock
index 9b59277f7..14db4f32e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -421,8 +421,7 @@ GEM
       systemu (~> 2.6.2)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    markerb (1.0.2)
-      redcarpet (>= 2.0)
+    markerb (1.1.0)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     messagebus_ruby_api (1.0.3)
@@ -802,7 +801,7 @@ DEPENDENCIES
   json (= 1.8.3)
   json-schema (= 2.5.1)
   logging-rails (= 0.5.0)
-  markerb (= 1.0.2)
+  markerb (= 1.1.0)
   messagebus_ruby_api (= 1.0.3)
   mini_magick (= 4.2.7)
   minitest