Ivan Tashkinov 0c65a8c3d0 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation ... # Conflicts: # config/config.exs		2020-02-20 15:00:48 +03:00
..
builders	added User.NotificationSetting struct	2019-11-28 22:08:30 +03:00
captcha_mock.ex
channel_case.ex	ChatChannel: Ignore messages that are too long.	2019-12-04 12:48:34 +01:00
cluster.ex	Add federated test infrastructure	2019-11-26 15:01:35 -05:00
conn_case.ex	[#2068] Introduced proper OAuth tokens usage to controller tests.	2019-12-19 17:23:27 +03:00
data_case.ex
factory.ex	renaming	2020-01-16 08:50:27 +03:00
helpers.ex	Tweaks to clear_config calls in tests in order to prevent side effects on config during test suite execution.	2020-02-13 21:55:47 +03:00
http_request_mock.ex	Fix compatibility with Elixir v1.10	2020-01-28 18:23:59 +04:00
mrf_module_mock.ex
oban_helpers.ex	[#1505] Background fetching of incoming activities' replies collections.	2020-01-25 10:47:30 +03:00
web_push_http_client_mock.ex
websocket_client.ex