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

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

Mon, 31 May 2021 09:53:57 +0000 (11:53 +0200)

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

Mon, 31 May 2021 09:53:57 +0000 (11:53 +0200)
author Claire <claire.github-309c@sitedethib.com>
Mon, 31 May 2021 09:53:57 +0000 (11:53 +0200)
committer Claire <claire.github-309c@sitedethib.com>
Mon, 31 May 2021 09:53:57 +0000 (11:53 +0200)
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>
	Mon, 31 May 2021 09:53:57 +0000 (11:53 +0200)
committer	Claire <claire.github-309c@sitedethib.com>
	Mon, 31 May 2021 09:53:57 +0000 (11:53 +0200)
		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