From f25707a58ee78310427665de06fb0995691e3572 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Sun, 2 Oct 2011 12:35:12 -0700
Subject: [PATCH] updated sass; removed kaminari gem

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

diff --git a/Gemfile b/Gemfile
index dfe54fda9..89d4d823b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -89,9 +89,8 @@ gem 'http_accept_language', :git => 'git://github.com/iain/http_accept_language.
 # views
 
 gem 'haml', '3.1.2'
-gem 'kaminari'
 gem 'mobile-fu'
-gem 'sass', '3.1.4'
+gem 'sass', '3.1.7'
 gem 'will_paginate', '3.0.pre2'
 
 # web
diff --git a/Gemfile.lock b/Gemfile.lock
index 4f0df15ca..c048854c2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -237,8 +237,6 @@ GEM
     json_pure (1.6.1)
     jwt (0.1.3)
       json (>= 1.2.4)
-    kaminari (0.12.4)
-      rails (>= 3.0.0)
     linecache (0.43)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
@@ -414,7 +412,7 @@ GEM
       archive-tar-minitar (>= 0.5.2)
     rubyntlm (0.1.1)
     rubyzip (0.9.4)
-    sass (3.1.4)
+    sass (3.1.7)
     selenium-webdriver (2.7.0)
       childprocess (>= 0.2.1)
       ffi (>= 1.0.7)
@@ -505,7 +503,6 @@ DEPENDENCIES
   jasmine (= 1.1.0.rc3)
   json (= 1.4.6)
   jwt (= 0.1.3)
-  kaminari
   linecache (= 0.43)
   mini_magick (= 3.2)
   mobile-fu
@@ -531,7 +528,7 @@ DEPENDENCIES
   rspec-rails (>= 2.0.0)
   ruby-debug
   ruby-debug19
-  sass (= 3.1.4)
+  sass (= 3.1.7)
   selenium-webdriver (~> 2.7.0)
   settingslogic (= 2.0.6)
   sod!