Ivan Tashkinov 06b3bb54c5 Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/account_controller.ex # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex		2019-10-06 11:43:49 +03:00
..
builders
captcha_mock.ex	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
channel_case.ex
conn_case.ex	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
data_case.ex	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
factory.ex	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-02 20:42:40 +03:00
helpers.ex	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
http_request_mock.ex	Add test for handling Announces with inlined object from different origin	2019-10-05 13:56:40 +02:00
mrf_module_mock.ex	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
oban_helpers.ex	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
web_push_http_client_mock.ex	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
websocket_client.ex