From c64e2f9e5aa69bfb57dc1c7f5893dbe905a7cce7 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andis@fet.at>
Date: Fri, 17 Oct 2014 10:21:04 +0200
Subject: [PATCH] merge fiy

---
 Gemfile.lock | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 105de97..91116a2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -266,6 +266,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+
+=======
+  RedCloth
   acts_as_votable
   annotate (>= 2.5.0)
   awesome_nested_set
@@ -303,7 +306,6 @@ DEPENDENCIES
   rolify
   rspec-rails
   rubyzip
-  sanitize!
   sass-rails (~> 3.2)
   seed_dump (~> 0.5.3)
   simple_calendar (~> 0.1.9)