Merge remote-tracking branch 'upstream/pull/3177'

author Tom Hughes <tom@compton.nu>

Thu, 24 Jun 2021 07:43:18 +0000 (08:43 +0100)

committer Tom Hughes <tom@compton.nu>

Thu, 24 Jun 2021 07:43:18 +0000 (08:43 +0100)
author Tom Hughes <tom@compton.nu>
Thu, 24 Jun 2021 07:43:18 +0000 (08:43 +0100)
committer Tom Hughes <tom@compton.nu>
Thu, 24 Jun 2021 07:43:18 +0000 (08:43 +0100)
diff --cc .rubocop.yml
Simple merge
diff --cc .rubocop_todo.yml
Simple merge
diff --cc Gemfile.lock
Simple merge
diff --cc config/locales/en.yml
Simple merge
author	Tom Hughes <tom@compton.nu>
	Thu, 24 Jun 2021 07:43:18 +0000 (08:43 +0100)
committer	Tom Hughes <tom@compton.nu>
	Thu, 24 Jun 2021 07:43:18 +0000 (08:43 +0100)
		1	2
.rubocop.yml	patch \|	diff1 \|	diff2 \|	blob \| history
.rubocop_todo.yml	patch \|	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	patch \|	diff1 \|	diff2 \|	blob \| history
config/locales/en.yml	patch \|	diff1 \|	diff2 \|	blob \| history