Ivan Tashkinov 6f67aed3ac [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # lib/pleroma/web/admin_api/admin_api_controller.ex		2019-09-19 10:59:09 +03:00
..
builders	Fix tests	2019-04-19 23:26:41 +07:00
captcha_mock.ex	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
channel_case.ex	tests: add legal boilerplate	2018-12-23 20:57:10 +00:00
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] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).	2019-09-15 18:22:08 +03:00
helpers.ex	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
http_request_mock.ex	Merge branch 'chores/bump-copyright-year' into 'develop'	2019-09-18 21:57:49 +00: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	tests: add legal boilerplate	2018-12-23 20:57:10 +00:00