Alex Gleason 48983e9421 Merge remote-tracking branch 'upstream/develop' into by-approval		2020-07-14 18:56:40 -05:00
..
activity_pub	Merge branch '1916-transmogrifier-skipping-oddities-in-address-fields' into 'develop'	2020-07-14 15:17:25 +00:00
admin_api	Merge remote-tracking branch 'upstream/develop' into by-approval	2020-07-14 18:56:40 -05:00
api_spec	[#1940] Added admin_token param (as admin_api_params/0) to existing Admin API OpenAPI operations.	2020-07-14 19:31:05 +03:00
auth
channels
common_api
federator
feed
mailer
mastodon_api
media_proxy
metadata
mongooseim
nodeinfo
oauth
ostatus
pleroma_api
preload
push
rich_media
static_fe
streamer
templates
twitter_api
views
web_finger
xml
api_spec.ex
chat_channel.ex
controller_helper.ex
embed_controller.ex
endpoint.ex
fallback_redirect_controller.ex
gettext.ex
masto_fe_controller.ex
metadata.ex
oauth.ex
preload.ex
rel_me.ex
router.ex	AdminAPI: Add PATCH /api/pleroma/admin/users/approve endpoint	2020-07-14 18:02:44 -05:00
translation_helpers.ex
uploader_controller.ex
web.ex