diff options
author | DavisLWebb <davislwebb@ymail.com> | 2014-03-02 15:06:54 -0500 |
---|---|---|
committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-02 15:06:54 -0500 |
commit | b677983475513c78108406901fccd5cbe9604ca6 (patch) | |
tree | f83b5e20930cbe1be890af41ea1d0c0d2ebf5e2e /Gemfile | |
parent | 4e682a9a8596326a2d1faab6c44e5a54918c5ba0 (diff) | |
parent | 1bfc0513fa113f5b4a61e89d74e42dd78ece44e7 (diff) |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts:
Gemfile.lock
app/views/layouts/application.html.erb
config/routes.rb
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' |