Ivan Tashkinov 1298a2ea2c Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # mix.lock		2020-08-07 09:38:05 +03:00
..
activity_pub	Merge branch 'deactivated-user-posts' into 'develop'	2020-08-04 19:17:30 +00:00
admin_api
api_spec
auth
channels
common_api
federator
feed
mailer
mastodon_api	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	2020-08-07 09:38:05 +03:00
media_proxy
metadata
mongooseim
nodeinfo
oauth	[#2025] Defaulted OAuth login scopes choice to all scopes when user selects no scopes.	2020-08-06 16:00:00 +03:00
ostatus
pleroma_api
preload
push
rich_media	Consolidate construction of Rich Media Parser HTTP requests	2020-08-03 12:37:31 -05:00
static_fe
streamer
templates	templates/layout/app.html.eex: fix link color	2020-08-05 00:01:30 +02:00
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	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	2020-08-07 09:38:05 +03:00
translation_helpers.ex
uploader_controller.ex
web.ex