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

author Thibaut Girka <thib@sitedethib.com>

Tue, 20 Aug 2019 08:33:24 +0000 (10:33 +0200)

committer Thibaut Girka <thib@sitedethib.com>

Tue, 20 Aug 2019 08:33:24 +0000 (10:33 +0200)
author Thibaut Girka <thib@sitedethib.com>
Tue, 20 Aug 2019 08:33:24 +0000 (10:33 +0200)
committer Thibaut Girka <thib@sitedethib.com>
Tue, 20 Aug 2019 08:33:24 +0000 (10:33 +0200)
diff --cc package.json
Simple merge
diff --cc yarn.lock
Simple merge
author	Thibaut Girka <thib@sitedethib.com>
	Tue, 20 Aug 2019 08:33:24 +0000 (10:33 +0200)
committer	Thibaut Girka <thib@sitedethib.com>
	Tue, 20 Aug 2019 08:33:24 +0000 (10:33 +0200)
		1	2
package.json	patch \|	diff1 \|	diff2 \|	blob \| history
yarn.lock	patch \|	diff1 \|	diff2 \|	blob \| history