Ivan Tashkinov 0e27c274f4 Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements ... # Conflicts: # test/web/mastodon_api/controllers/account_controller_test.exs		2020-03-20 18:08:23 +03:00
..
activity/ir	…
bbs	…
config	Improved in-test config management functions.	2020-03-18 20:30:31 +03:00
conversation	…
docs	…
emails	…
emoji	…
federation	…
fixtures	…
http	…
instance_static/emoji	…
integration	…
object	…
plugs	…
support	…
tasks	Improved in-test config management functions.	2020-03-18 20:30:31 +03:00
upload	…
uploaders	…
user	…
web	Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements	2020-03-20 18:08:23 +03:00
workers	Merge branch 'fix/no-email-no-fail' into 'develop'	2020-03-04 12:43:06 +00:00
activity_expiration_test.exs	…
activity_test.exs	…
bookmark_test.exs	…
captcha_test.exs	…
config_test.exs	…
conversation_test.exs	…
earmark_renderer_test.exs	…
emoji_test.exs	…
filter_test.exs	…
following_relationship_test.exs	…
formatter_test.exs	…
healthcheck_test.exs	…
html_test.exs	…
http_test.exs	…
job_queue_monitor_test.exs	…
keys_test.exs	…
list_test.exs	…
marker_test.exs	…
moderation_log_test.exs	…
notification_test.exs	…
object_test.exs	…
pagination_test.exs	…
registration_test.exs	…
repo_test.exs	…
reverse_proxy_test.exs	…
runtime_test.exs	…
safe_jsonb_set_test.exs	…
scheduled_activity_test.exs	…
signature_test.exs	…
stat_test.exs	…
test_helper.exs	…
upload_test.exs	…
user_invite_token_test.exs	…
user_relationship_test.exs	…
user_search_test.exs	…
user_test.exs	…
xml_builder_test.exs	…