lain a6c14041c4 Merge branch 'develop' into 'issue/1975' ... # Conflicts: # CHANGELOG.md		2020-09-23 09:16:00 +00:00
..
activity_pub	ActivityPub: Don't block-filter your own posts	2020-09-21 16:08:38 +02:00
admin_api	…
api_spec	Merge branch 'develop' into issue/1975	2020-09-22 21:42:10 +03:00
auth	…
channels	…
common_api	…
fed_sockets	Force HTTP for fedsockets	2020-09-21 10:13:41 -05:00
federator	…
feed	…
mailer	…
mastodon_api	Merge remote-tracking branch 'upstream/develop' into email-fix-develop	2020-09-22 13:37:02 -05:00
media_proxy	…
metadata	…
mongooseim	…
nodeinfo	…
oauth	…
ostatus	…
pleroma_api	Merge branch 'develop' into issue/1975	2020-09-22 21:42:10 +03:00
preload	…
push	…
rich_media	…
static_fe	…
streamer	[#2074] OAuth scope checking in Streaming API.	2020-09-19 19:16:55 +03:00
templates	…
twitter_api	…
views	…
web_finger	…
xml	…
api_spec.ex	OpenAPI: make it possible to generate a spec without starting the app	2020-09-19 16:26:15 +03:00
chat_channel.ex	…
controller_helper.ex	…
embed_controller.ex	…
endpoint.ex	…
fallback_redirect_controller.ex	…
gettext.ex	…
instance_document.ex	…
masto_fe_controller.ex	…
metadata.ex	…
oauth.ex	…
preload.ex	…
rel_me.ex	…
router.ex	Merge branch 'develop' into issue/1975	2020-09-22 21:42:10 +03:00
translation_helpers.ex	…
uploader_controller.ex	…
web.ex	…