Merge branch 'support-rel-ugc' into 'develop'

author kaniini <ariadne@dereferenced.org>

Mon, 23 Sep 2019 22:41:31 +0000 (22:41 +0000)

committer kaniini <ariadne@dereferenced.org>

Mon, 23 Sep 2019 22:41:31 +0000 (22:41 +0000)
author kaniini <ariadne@dereferenced.org>
Mon, 23 Sep 2019 22:41:31 +0000 (22:41 +0000)
committer kaniini <ariadne@dereferenced.org>
Mon, 23 Sep 2019 22:41:31 +0000 (22:41 +0000)
diff --cc CHANGELOG.md
Simple merge
diff --cc config/config.exs
Simple merge
diff --cc config/description.exs
Simple merge
diff --cc docs/config.md
Simple merge
diff --cc test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge
author	kaniini <ariadne@dereferenced.org>
	Mon, 23 Sep 2019 22:41:31 +0000 (22:41 +0000)
committer	kaniini <ariadne@dereferenced.org>
	Mon, 23 Sep 2019 22:41:31 +0000 (22:41 +0000)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
config/config.exs	patch \|	diff1 \|	diff2 \|	blob \| history
config/description.exs	patch \|	diff1 \|	diff2 \|	blob \| history
docs/config.md	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/mastodon_api/mastodon_api_controller_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history