Ivan Tashkinov 3fa51f7272 Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses ...

# Conflicts:
#	lib/pleroma/web/mastodon_api/views/account_view.ex
#	lib/pleroma/web/mastodon_api/views/status_view.ex

2020-04-02 19:38:39 +03:00

..

activity_pub

Merge branch 'develop' into gun

2020-03-30 12:15:23 +03:00

admin_api

Merge branch 'gun' into 'develop'

2020-04-01 17:05:09 +00:00

auth

Update Copyrights

2020-03-03 16:44:49 -06:00

common_api

Merge branch 'develop' into gun

2020-03-20 20:47:54 +03:00

feed

Merge branch 'fix-feed-pagination' into 'develop'

2020-03-20 16:57:51 +00:00

instances

Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).

2020-03-20 18:33:00 +03:00

mastodon_api

Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses

2020-04-02 19:38:39 +03:00

media_proxy

Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).

2020-03-20 18:33:00 +03:00

metadata

restrict remote users from indexing

2020-04-01 09:57:12 +03:00

mongooseim

Update Copyrights

2020-03-03 16:44:49 -06:00

oauth

Merge branch 'feature/funkwhale-audio' into 'develop'

2020-03-29 19:18:22 +00:00

ostatus

Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).

2020-03-20 18:33:00 +03:00

pleroma_api/controllers

Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).

2020-03-20 18:33:00 +03:00

plugs

Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).

2020-03-20 18:33:00 +03:00

push

Merge branch 'develop' into gun

2020-02-29 11:34:50 +03:00

rich_media

Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).

2020-03-20 18:33:00 +03:00

static_fe

Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).

2020-03-20 18:33:00 +03:00

streamer

Merge branch 'develop' into gun

2020-03-20 20:47:54 +03:00

twitter_api

Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).

2020-03-20 18:33:00 +03:00

views

Update Copyrights

2020-03-03 16:44:49 -06:00

web_finger

Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).

2020-03-20 18:33:00 +03:00

chat_channel_test.exs

Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).

2020-03-20 18:33:00 +03:00

fallback_test.exs

Update Copyrights

2020-03-03 16:44:49 -06:00

federator_test.exs

Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).

2020-03-20 18:33:00 +03:00

masto_fe_controller_test.exs

Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).

2020-03-20 18:33:00 +03:00

node_info_test.exs

Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).

2020-03-20 18:33:00 +03:00

rel_me_test.exs

Update Copyrights

2020-03-03 16:44:49 -06:00

uploader_controller_test.exs

Update Copyrights

2020-03-03 16:44:49 -06:00