From fcbe330ea4721b3143c7517fed5b0313d6d824d0 Mon Sep 17 00:00:00 2001
From: Thomas Blazek <wtblazek@gmail.com>
Date: Thu, 25 Jul 2013 16:54:17 +0200
Subject: [PATCH] Gem update

---
 Gemfile      | 1 +
 Gemfile.lock | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/Gemfile b/Gemfile
index 2cbf68f..3fb298c 100755
--- a/Gemfile
+++ b/Gemfile
@@ -70,3 +70,4 @@ gem 'haml'
 #gem 'gollum'
 gem 'awesome_nested_set'
 gem 'annotate', ">=2.5.0"
+gem 'carrierwave'
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 7381438..9508763 100755
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -39,6 +39,10 @@ GEM
       sass (~> 3.2)
     builder (3.0.4)
     cancan (1.6.9)
+    carrierwave (0.9.0)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+      json (>= 1.7)
     cocaine (0.4.2)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -157,6 +161,7 @@ DEPENDENCIES
   awesome_nested_set
   bootstrap-sass (~> 2.2.0)
   cancan
+  carrierwave
   coffee-rails (~> 3.2.1)
   devise (~> 2.2.3)
   execjs (~> 1.4.0)