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

author Thibaut Girka <thib@sitedethib.com>

Mon, 11 Mar 2019 16:31:02 +0000 (17:31 +0100)

committer Thibaut Girka <thib@sitedethib.com>

Mon, 11 Mar 2019 16:31:02 +0000 (17:31 +0100)
author Thibaut Girka <thib@sitedethib.com>
Mon, 11 Mar 2019 16:31:02 +0000 (17:31 +0100)
committer Thibaut Girka <thib@sitedethib.com>
Mon, 11 Mar 2019 16:31:02 +0000 (17:31 +0100)
diff --cc Gemfile
Simple merge
diff --cc Gemfile.lock
Simple merge
author	Thibaut Girka <thib@sitedethib.com>
	Mon, 11 Mar 2019 16:31:02 +0000 (17:31 +0100)
committer	Thibaut Girka <thib@sitedethib.com>
	Mon, 11 Mar 2019 16:31:02 +0000 (17:31 +0100)
		1	2
Gemfile	patch \|	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	patch \|	diff1 \|	diff2 \|	blob \| history