Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instan...

author Ivan Tashkinov <ivantashkinov@gmail.com>

Mon, 2 Mar 2020 15:41:12 +0000 (18:41 +0300)

committer Ivan Tashkinov <ivantashkinov@gmail.com>

Mon, 2 Mar 2020 15:41:12 +0000 (18:41 +0300)
author Ivan Tashkinov <ivantashkinov@gmail.com>
Mon, 2 Mar 2020 15:41:12 +0000 (18:41 +0300)
committer Ivan Tashkinov <ivantashkinov@gmail.com>
Mon, 2 Mar 2020 15:41:12 +0000 (18:41 +0300)
diff --cc lib/pleroma/web/twitter_api/controllers/util_controller.ex
Simple merge
diff --cc test/web/activity_pub/publisher_test.exs
Simple merge
diff --cc test/web/feed/user_controller_test.exs
Simple merge
diff --cc test/web/twitter_api/util_controller_test.exs
Simple merge
author	Ivan Tashkinov <ivantashkinov@gmail.com>
	Mon, 2 Mar 2020 15:41:12 +0000 (18:41 +0300)
committer	Ivan Tashkinov <ivantashkinov@gmail.com>
	Mon, 2 Mar 2020 15:41:12 +0000 (18:41 +0300)
		1	2
lib/pleroma/web/twitter_api/controllers/util_controller.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/activity_pub/publisher_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/feed/user_controller_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/twitter_api/util_controller_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history