summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-03-01 23:49:38 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-03-01 23:49:38 -0500
commit14b3559962f3e5cd8849bdcdc2de35ffae86621c (patch)
tree3aed4cb0ca0cdd563784f63d15e909c3715b0d72 /Gemfile
parent65289cfb93599cdad1f3476f2f8728e5b0752779 (diff)
parent4dcb9de406dd032ecb37109402c4475d96d2a05a (diff)
Merge branch 'master' of github.com:LukeShu/leager
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index cc95938..cb3d6f6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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'