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

author Thibaut Girka <thib@sitedethib.com>

Tue, 23 Oct 2018 15:15:57 +0000 (17:15 +0200)

committer Thibaut Girka <thib@sitedethib.com>

Tue, 23 Oct 2018 15:15:57 +0000 (17:15 +0200)
author Thibaut Girka <thib@sitedethib.com>
Tue, 23 Oct 2018 15:15:57 +0000 (17:15 +0200)
committer Thibaut Girka <thib@sitedethib.com>
Tue, 23 Oct 2018 15:15:57 +0000 (17:15 +0200)
diff --cc Dockerfile
Simple merge
diff --cc Gemfile
Simple merge
diff --cc Gemfile.lock
Simple merge
author	Thibaut Girka <thib@sitedethib.com>
	Tue, 23 Oct 2018 15:15:57 +0000 (17:15 +0200)
committer	Thibaut Girka <thib@sitedethib.com>
	Tue, 23 Oct 2018 15:15:57 +0000 (17:15 +0200)
		1	2
Dockerfile	patch \|	diff1 \|	diff2 \|	blob \| history
Gemfile	patch \|	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	patch \|	diff1 \|	diff2 \|	blob \| history