feld 008499f65a Merge branch 'develop' into 'fix/2412-filters' ... # Conflicts: # CHANGELOG.md		2021-02-03 14:23:23 +00:00
..
activity_pub	Merge branch 'feature/2438-users-posts-total-count' into 'develop'	2021-02-03 14:21:57 +00:00
admin_api	added total	2021-01-27 07:45:06 +03:00
api_spec	Merge branch 'develop' into 'fix/2412-filters'	2021-02-03 14:23:23 +00:00
auth
channels
common_api
fallback
federator
feed
mailer
mastodon_api	Merge branch 'develop' into 'fix/2412-filters'	2021-02-03 14:23:23 +00:00
media_proxy
metadata
mongoose_im
nodeinfo
o_auth
o_status
pleroma_api
plugs	Add active user count	2021-01-27 18:20:06 +04:00
preload/providers
push
rich_media
static_fe
templates	Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).	2021-01-28 19:49:43 +03:00
twitter_api
views	Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).	2021-01-28 19:49:43 +03:00
web_finger
api_spec.ex	Improve OpenAPI spec and deploy it to api.pleroma.social	2021-02-03 16:07:44 +03:00
chat_channel.ex
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
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 'email-stub-in-verify-credentials' into 'develop'	2021-02-02 18:35:08 +00:00
streamer.ex
translation_helpers.ex
uploader_controller.ex
web_finger.ex
xml.ex