diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-01 23:49:38 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-01 23:49:38 -0500 |
commit | 5e11b5212272613367193f90a0a211f4fa08b2af (patch) | |
tree | b6e19db560241ed3422f150d81877691b1c52159 /Gemfile | |
parent | 6afb9ac595b025b06c7664e600aa3781c217651f (diff) | |
parent | c1f3f731cdf3201905fd8797dd4fe33783f2bc53 (diff) |
Merge branch 'master' of github.com:LukeShu/leager
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3,7 +3,6 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.0.2' -gem 'bootstrap-sass' # bcrypt is used for password digesting gem 'bcrypt-ruby', '3.1.2' @@ -23,6 +22,7 @@ end # Use SCSS for stylesheets gem 'sass-rails', '~> 4.0.0' +gem 'bootstrap-sass' # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 1.3.0' |