Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements

author Ivan Tashkinov <ivantashkinov@gmail.com>

Fri, 20 Mar 2020 15:08:23 +0000 (18:08 +0300)

committer Ivan Tashkinov <ivantashkinov@gmail.com>

Fri, 20 Mar 2020 15:08:23 +0000 (18:08 +0300)
author Ivan Tashkinov <ivantashkinov@gmail.com>
Fri, 20 Mar 2020 15:08:23 +0000 (18:08 +0300)
committer Ivan Tashkinov <ivantashkinov@gmail.com>
Fri, 20 Mar 2020 15:08:23 +0000 (18:08 +0300)
diff --cc test/web/mastodon_api/controllers/account_controller_test.exs
Simple merge
diff --cc test/web/mastodon_api/controllers/status_controller_test.exs
Simple merge
author	Ivan Tashkinov <ivantashkinov@gmail.com>
	Fri, 20 Mar 2020 15:08:23 +0000 (18:08 +0300)
committer	Ivan Tashkinov <ivantashkinov@gmail.com>
	Fri, 20 Mar 2020 15:08:23 +0000 (18:08 +0300)
		1	2
test/web/mastodon_api/controllers/account_controller_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/mastodon_api/controllers/status_controller_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history