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

author Thibaut Girka <thib@sitedethib.com>

Fri, 28 Jun 2019 19:36:50 +0000 (21:36 +0200)

committer Thibaut Girka <thib@sitedethib.com>

Fri, 28 Jun 2019 19:36:50 +0000 (21:36 +0200)
author Thibaut Girka <thib@sitedethib.com>
Fri, 28 Jun 2019 19:36:50 +0000 (21:36 +0200)
committer Thibaut Girka <thib@sitedethib.com>
Fri, 28 Jun 2019 19:36:50 +0000 (21:36 +0200)
diff --cc db/schema.rb
Simple merge
diff --cc yarn.lock
Simple merge
author	Thibaut Girka <thib@sitedethib.com>
	Fri, 28 Jun 2019 19:36:50 +0000 (21:36 +0200)
committer	Thibaut Girka <thib@sitedethib.com>
	Fri, 28 Jun 2019 19:36:50 +0000 (21:36 +0200)
		1	2
db/schema.rb	patch \|	diff1 \|	diff2 \|	blob \| history
yarn.lock	patch \|	diff1 \|	diff2 \|	blob \| history