diff options
author | spag <spag@golwen.net> | 2013-01-16 10:31:18 +0100 |
---|---|---|
committer | spag <spag@golwen.net> | 2013-01-16 10:31:18 +0100 |
commit | 1de09183010a7f021455ce69877b78051d5c4bf1 (patch) | |
tree | 736f546009b2d85dcd470e044576442e464b93b1 /Gemfile | |
parent | 473e6c52eff0576829138b59b99f83917ff6b0e9 (diff) | |
parent | 8e16b8a24341fd579d97ce47512951a3d14250c1 (diff) |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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' |