Merge remote-tracking branch 'upstream/pull/3177'
authorTom Hughes <tom@compton.nu>
Thu, 24 Jun 2021 07:43:18 +0000 (08:43 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 24 Jun 2021 07:43:18 +0000 (08:43 +0100)
1  2 
.rubocop.yml
.rubocop_todo.yml
Gemfile.lock
config/locales/en.yml

diff --cc .rubocop.yml
Simple merge
Simple merge
diff --cc Gemfile.lock
Simple merge
Simple merge