feld d289ad8579 Merge branch 'develop' into 'fix/2411-mutes-api' ... # Conflicts: # CHANGELOG.md # docs/development/API/differences_in_mastoapi_responses.md		2021-02-02 17:57:58 +00:00
..
activity_pub	only_remote -> remote renaming	2021-02-01 14:11:12 +03:00
admin_api	Merge branch 'develop' into refactor/deactivated_user_field	2021-01-18 14:58:21 -06:00
api_spec	Merge branch 'develop' into 'fix/2411-mutes-api'	2021-02-02 17:57:58 +00:00
auth	Remove toggle_confirmation; require explicit state change	2021-01-15 13:11:51 -06:00
channels	…
common_api	…
fallback	…
federator	…
feed	…
mailer	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
mastodon_api	Merge branch 'develop' into 'fix/2411-mutes-api'	2021-02-02 17:57:58 +00:00
media_proxy	rename function	2021-01-21 14:41:28 -06:00
metadata	…
mongoose_im	Change user.deactivated field to user.is_active	2021-01-15 11:24:46 -06:00
nodeinfo	…
o_auth	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
o_status	…
pleroma_api	Change user.deactivated field to user.is_active	2021-01-15 11:24:46 -06:00
plugs	Add active user count	2021-01-27 18:20:06 +04:00
preload/providers	…
push	…
rich_media	…
static_fe	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
templates	…
twitter_api	Merge branch 'develop' into refactor/deactivated_user_field	2021-01-18 14:58:21 -06:00
views	…
web_finger	…
api_spec.ex	…
chat_channel.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
common_api.ex	…
controller_helper.ex	…
embed_controller.ex	…
endpoint.ex	like this	2021-01-29 15:55:00 +03:00
federator.ex	…
gettext.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
instance_document.ex	…
masto_fe_controller.ex	…
media_proxy.ex	…
metadata.ex	…
o_auth.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
plug.ex	…
preload.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
push.ex	…
rel_me.ex	…
router.ex	Add active user count	2021-01-27 18:20:06 +04:00
streamer.ex	…
translation_helpers.ex	…
uploader_controller.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
web_finger.ex	…
xml.ex	…