Merge branch 'develop' of github.com:amooma/GS5 into develop

1 files changed, 2 insertions, 2 deletions

diff --git a/Gemfile b/Gemfile
index d505227..c3d86f9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.2.2'
+gem 'rails', '3.2.9'
 gem 'bcrypt-ruby'
 gem 'sqlite3'
 gem 'mysql2'
@@ -23,7 +23,7 @@ gem "nokogiri"
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails',   '~> 3.2.3'
+  gem 'sass-rails'
   gem 'coffee-rails', '~> 3.2.1'
   gem 'compass-rails'
   gem 'uglifier', '>= 1.3.0'