Merge branch 'feature/770-add-emoji-tags' into 'develop'

author lambda <lain@soykaf.club>

Mon, 8 Apr 2019 09:50:00 +0000 (09:50 +0000)

committer lambda <lain@soykaf.club>

Mon, 8 Apr 2019 09:50:00 +0000 (09:50 +0000)
author lambda <lain@soykaf.club>
Mon, 8 Apr 2019 09:50:00 +0000 (09:50 +0000)
committer lambda <lain@soykaf.club>
Mon, 8 Apr 2019 09:50:00 +0000 (09:50 +0000)
diff --cc config/config.exs
Simple merge
diff --cc lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge
diff --cc test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge
author	lambda <lain@soykaf.club>
	Mon, 8 Apr 2019 09:50:00 +0000 (09:50 +0000)
committer	lambda <lain@soykaf.club>
	Mon, 8 Apr 2019 09:50:00 +0000 (09:50 +0000)
		1	2
config/config.exs	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/mastodon_api/mastodon_api_controller_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history