merge master

This commit is contained in:
Michael Ball 2020-12-04 01:17:39 -08:00
commit 2892a56a1c
12 changed files with 70 additions and 70 deletions

View file

@ -10,7 +10,7 @@ if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.8.4')
end
# as web framework
gem 'rails', '~> 5.2.4.3'
gem 'rails', '~> 5.2'
# Use Puma as the app server
gem 'puma', '~> 3.0'
@ -81,7 +81,7 @@ gem 'formtastic-bootstrap'
# as the JavaScript library
gem 'jquery-rails'
gem 'jquery-ui-rails', '~> 4.2.1'
gem 'jquery-ui-rails', '~> 6.0.1'
# for languages validation
gem 'iso-639'