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

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

Mon, 15 Mar 2021 10:26:59 +0000 (11:26 +0100)

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

Mon, 15 Mar 2021 10:26:59 +0000 (11:26 +0100)
author Claire <claire.github-309c@sitedethib.com>
Mon, 15 Mar 2021 10:26:59 +0000 (11:26 +0100)
committer Claire <claire.github-309c@sitedethib.com>
Mon, 15 Mar 2021 10:26:59 +0000 (11:26 +0100)
diff --cc Gemfile
Simple merge
diff --cc Gemfile.lock
Simple merge
diff --cc app/models/account.rb
Simple merge
diff --cc app/workers/scheduler/feed_cleanup_scheduler.rb
Simple merge
diff --cc db/schema.rb
Simple merge
diff --cc package.json
Simple merge
author	Claire <claire.github-309c@sitedethib.com>
	Mon, 15 Mar 2021 10:26:59 +0000 (11:26 +0100)
committer	Claire <claire.github-309c@sitedethib.com>
	Mon, 15 Mar 2021 10:26:59 +0000 (11:26 +0100)
		1	2
Gemfile	patch \|	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	patch \|	diff1 \|	diff2 \|	blob \| history
app/models/account.rb	patch \|	diff1 \|	diff2 \|	blob \| history
app/workers/scheduler/feed_cleanup_scheduler.rb	patch \|	diff1 \|	diff2 \|	blob \| history
db/schema.rb	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history