minibikini 6163fbf553 Merge branch 'develop' into 'frontend-admin-api' ... # Conflicts: # lib/pleroma/web/router.ex		2020-11-02 10:43:45 +00:00
..
activity_pub	Add idempotency_key to the chat_message entity.	2020-10-31 05:50:59 +03:00
admin_api	Merge branch 'develop' into 'frontend-admin-api'	2020-11-02 10:43:45 +00:00
api_spec	Merge branch 'develop' into 'frontend-admin-api'	2020-11-02 10:43:45 +00:00
auth
channels
common_api
fallback
fed_sockets
federator
feed	[#3053] Post-merge fix.	2020-10-17 13:33:57 +03:00
mailer
mastodon_api	Merge branch 'issue/2069' into 'develop'	2020-10-29 23:39:15 +00:00
media_proxy
metadata
mongoose_im
nodeinfo
o_auth
o_status	Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances	2020-10-17 13:12:39 +03:00
pleroma_api	Merge branch 'feature/account-export' into 'develop'	2020-10-31 17:03:40 +00:00
plugs	FrontStatic plug: excluded invalid url	2020-10-27 22:59:27 +03:00
preload/providers
push
rich_media
static_fe	@doc fix.	2020-10-28 19:09:38 +03:00
templates
twitter_api
views
web_finger
api_spec.ex
chat_channel.ex
common_api.ex	Add idempotency_key to the chat_message entity.	2020-10-31 05:50:59 +03:00
controller_helper.ex
embed_controller.ex
endpoint.ex	Merge branch '1668-prometheus-access-restrictions' into 'develop'	2020-10-27 17:47:56 +00:00
fed_sockets.ex
federator.ex
gettext.ex
instance_document.ex
masto_fe_controller.ex
media_proxy.ex
metadata.ex
o_auth.ex
plug.ex
preload.ex
push.ex
rel_me.ex
router.ex	Merge branch 'develop' into 'frontend-admin-api'	2020-11-02 10:43:45 +00:00
streamer.ex
translation_helpers.ex
uploader_controller.ex
web_finger.ex
xml.ex