From f890121b8fd777db9602017e66258bba792323cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sun, 9 Nov 2014 19:23:21 +0100
Subject: [PATCH] bump sass-rails

---
 Gemfile      |  2 +-
 Gemfile.lock | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index fad30aeea..d424f45bd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ gem 'rack-cors', '0.2.9', :require => 'rack/cors'
 
 gem 'bootstrap-sass', '2.3.2.2'
 gem 'compass-rails',  '2.0.0'
-gem 'sass-rails',     '4.0.3'
+gem 'sass-rails',     '4.0.4'
 
 # Database
 
diff --git a/Gemfile.lock b/Gemfile.lock
index acd5d5851..a00734644 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -82,7 +82,7 @@ GEM
       timers (~> 1.1.0)
     childprocess (0.5.5)
       ffi (~> 1.0, >= 1.0.11)
-    chunky_png (1.3.1)
+    chunky_png (1.3.3)
     coderay (1.1.0)
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
@@ -450,10 +450,10 @@ GEM
     rubyzip (1.1.6)
     safe_yaml (1.0.4)
     sass (3.2.19)
-    sass-rails (4.0.3)
+    sass-rails (4.0.4)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.0)
-      sprockets (~> 2.8, <= 2.11.0)
+      sass (~> 3.2.2)
+      sprockets (~> 2.8, < 2.12)
       sprockets-rails (~> 2.0)
     selenium-webdriver (2.43.0)
       childprocess (~> 0.5)
@@ -481,7 +481,7 @@ GEM
       railties (>= 3.1)
     slop (3.6.0)
     spork (1.0.0rc4)
-    sprockets (2.11.0)
+    sprockets (2.11.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -617,7 +617,7 @@ DEPENDENCIES
   rspec-instafail (= 0.2.5)
   rspec-rails (= 3.1.0)
   ruby-oembed (= 0.8.10)
-  sass-rails (= 4.0.3)
+  sass-rails (= 4.0.4)
   selenium-webdriver (= 2.43.0)
   sidekiq (= 3.2.5)
   sidetiq (= 0.6.3)