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

author Thibaut Girka <thib@sitedethib.com>

Tue, 30 Oct 2018 10:22:25 +0000 (11:22 +0100)

committer Thibaut Girka <thib@sitedethib.com>

Tue, 30 Oct 2018 10:22:25 +0000 (11:22 +0100)
author Thibaut Girka <thib@sitedethib.com>
Tue, 30 Oct 2018 10:22:25 +0000 (11:22 +0100)
committer Thibaut Girka <thib@sitedethib.com>
Tue, 30 Oct 2018 10:22:25 +0000 (11:22 +0100)
diff --cc Gemfile
Simple merge
diff --cc Gemfile.lock
Simple merge
diff --cc spec/services/notify_service_spec.rb
Simple merge
author	Thibaut Girka <thib@sitedethib.com>
	Tue, 30 Oct 2018 10:22:25 +0000 (11:22 +0100)
committer	Thibaut Girka <thib@sitedethib.com>
	Tue, 30 Oct 2018 10:22:25 +0000 (11:22 +0100)
		1	2
Gemfile	patch \|	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	patch \|	diff1 \|	diff2 \|	blob \| history
spec/services/notify_service_spec.rb	patch \|	diff1 \|	diff2 \|	blob \| history