Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ gem 'capistrano-bundler', group: :development
gem 'mysql2'

# Use bootstrap-sass
gem 'bootstrap-sass', '~> 3.2.0.1'
gem 'bootstrap-sass', '~> 3.4.1'

#Gem for binding.pry
gem 'pry'
Expand Down
12 changes: 9 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,12 @@ GEM
thread_safe (~> 0.1)
tzinfo (~> 1.1)
arel (5.0.1.20140414130214)
autoprefixer-rails (9.6.5)
execjs
bluecloth (2.2.0)
bootstrap-sass (3.2.0.1)
sass (~> 3.2)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
bootstrap-will_paginate (0.0.10)
will_paginate
builder (3.2.2)
Expand Down Expand Up @@ -63,6 +66,7 @@ GEM
colorize (0.7.3)
erubis (2.7.0)
execjs (2.2.1)
ffi (1.11.1)
font-awesome-sass (4.1.0)
sass (~> 3.2)
friendly_id (5.0.4)
Expand Down Expand Up @@ -132,6 +136,8 @@ GEM
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0)
sassc (2.2.1)
ffi (~> 1.9)
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
Expand Down Expand Up @@ -176,7 +182,7 @@ PLATFORMS

DEPENDENCIES
bluecloth
bootstrap-sass (~> 3.2.0.1)
bootstrap-sass (~> 3.4.1)
bootstrap-will_paginate
bxslider-rails
capistrano-bundler
Expand Down