Merge remote-tracking branch 'pleroma/develop' into feature/disable-account

author Egor Kislitsyn <egor@kislitsyn.com>

Mon, 4 Mar 2019 13:48:43 +0000 (20:48 +0700)

committer Egor Kislitsyn <egor@kislitsyn.com>

Mon, 4 Mar 2019 13:48:43 +0000 (20:48 +0700)
author Egor Kislitsyn <egor@kislitsyn.com>
Mon, 4 Mar 2019 13:48:43 +0000 (20:48 +0700)
committer Egor Kislitsyn <egor@kislitsyn.com>
Mon, 4 Mar 2019 13:48:43 +0000 (20:48 +0700)
diff --cc lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge
diff --cc lib/pleroma/web/twitter_api/twitter_api.ex
Simple merge
diff --cc lib/pleroma/web/twitter_api/twitter_api_controller.ex
Simple merge
author	Egor Kislitsyn <egor@kislitsyn.com>
	Mon, 4 Mar 2019 13:48:43 +0000 (20:48 +0700)
committer	Egor Kislitsyn <egor@kislitsyn.com>
	Mon, 4 Mar 2019 13:48:43 +0000 (20:48 +0700)
		1	2
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/twitter_api/twitter_api.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/twitter_api/twitter_api_controller.ex	patch \|	diff1 \|	diff2 \|	blob \| history