Merge branch 'hj-happiness-improvement' into 'develop'

author kaniini <nenolod@gmail.com>

Tue, 29 Jan 2019 13:54:10 +0000 (13:54 +0000)

committer kaniini <nenolod@gmail.com>

Tue, 29 Jan 2019 13:54:10 +0000 (13:54 +0000)
author kaniini <nenolod@gmail.com>
Tue, 29 Jan 2019 13:54:10 +0000 (13:54 +0000)
committer kaniini <nenolod@gmail.com>
Tue, 29 Jan 2019 13:54:10 +0000 (13:54 +0000)
diff --cc config/config.exs
Simple merge
diff --cc docs/config.md
Simple merge
diff --cc lib/pleroma/application.ex
Simple merge
diff --cc lib/pleroma/web/router.ex
Simple merge
author	kaniini <nenolod@gmail.com>
	Tue, 29 Jan 2019 13:54:10 +0000 (13:54 +0000)
committer	kaniini <nenolod@gmail.com>
	Tue, 29 Jan 2019 13:54:10 +0000 (13:54 +0000)
		1	2
config/config.exs	patch \|	diff1 \|	diff2 \|	blob \| history
docs/config.md	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/application.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/router.ex	patch \|	diff1 \|	diff2 \|	blob \| history