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

author Claire <claire.github-309c@sitedethib.com>

Tue, 30 Nov 2021 11:13:54 +0000 (12:13 +0100)

committer Claire <claire.github-309c@sitedethib.com>

Tue, 30 Nov 2021 11:13:54 +0000 (12:13 +0100)
author Claire <claire.github-309c@sitedethib.com>
Tue, 30 Nov 2021 11:13:54 +0000 (12:13 +0100)
committer Claire <claire.github-309c@sitedethib.com>
Tue, 30 Nov 2021 11:13:54 +0000 (12:13 +0100)
diff --cc Gemfile
Simple merge
diff --cc Gemfile.lock
Simple merge
diff --cc package.json
Simple merge
diff --cc yarn.lock
Simple merge
author	Claire <claire.github-309c@sitedethib.com>
	Tue, 30 Nov 2021 11:13:54 +0000 (12:13 +0100)
committer	Claire <claire.github-309c@sitedethib.com>
	Tue, 30 Nov 2021 11:13:54 +0000 (12:13 +0100)
		1	2
Gemfile	patch \|	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history
yarn.lock	patch \|	diff1 \|	diff2 \|	blob \| history