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

author Thibaut Girka <thib@sitedethib.com>

Wed, 24 Apr 2019 13:25:22 +0000 (15:25 +0200)

committer Thibaut Girka <thib@sitedethib.com>

Wed, 24 Apr 2019 13:25:22 +0000 (15:25 +0200)
author Thibaut Girka <thib@sitedethib.com>
Wed, 24 Apr 2019 13:25:22 +0000 (15:25 +0200)
committer Thibaut Girka <thib@sitedethib.com>
Wed, 24 Apr 2019 13:25:22 +0000 (15:25 +0200)
diff --cc Gemfile
Simple merge
diff --cc Gemfile.lock
Simple merge
author	Thibaut Girka <thib@sitedethib.com>
	Wed, 24 Apr 2019 13:25:22 +0000 (15:25 +0200)
committer	Thibaut Girka <thib@sitedethib.com>
	Wed, 24 Apr 2019 13:25:22 +0000 (15:25 +0200)
		1	2
Gemfile	patch \|	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	patch \|	diff1 \|	diff2 \|	blob \| history