Merge branch 'main' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2022-02-08 18:23:53 +01:00
26 changed files with 628 additions and 594 deletions

View File

@@ -29,9 +29,7 @@ gem 'addressable', '~> 2.8'
gem 'bootsnap', '~> 1.10.2', require: false
gem 'browser'
gem 'charlock_holmes', '~> 0.7.7'
gem 'iso-639'
gem 'chewy', '~> 7.2'
gem 'cld3', '~> 3.4.4'
gem 'devise', '~> 4.8'
gem 'devise-two-factor', '~> 4.0'