Bump http_accept_language from 2.0.5 to 2.1.1
Compare changes
Files
2
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 44
− 44
source 'https://rubygems.org'
gem 'bootstrap', '~> 4.1.0'
gem 'sprockets-rails', :require => 'sprockets/railtie'
gem "font-awesome5-rails"
gem "inline_svg"
gem 'http_accept_language', '~>2.0.5'
gem "devise"
gem "pg", '~> 0.21'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.0.0'
gem 'sqlite3', '~> 1.3.6'
gem 'puma', '~> 3.10.0'
gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.2'
gem 'jquery-rails'
gem 'turbolinks', '~> 5'
gem 'byebug', platform: :mri
gem 'listen'
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]