Ivan Tashkinov 8f88a90ca3 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # lib/pleroma/application.ex # lib/pleroma/config.ex		2021-02-23 13:58:35 +03:00
..
activity_pub	[#3213] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.	2021-02-23 13:52:28 +03:00
admin_api	OAuthScopesPlug: remove transform_scopes in favor of explicit admin scope definitions	2021-02-17 21:37:23 +03:00
api_spec	Merge branch 'fix/chats-no-unread-in-openapi' into 'develop'	2021-02-18 09:54:59 +00:00
auth
channels
common_api
fallback
federator
feed
mailer
mastodon_api	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-02-23 13:58:35 +03:00
media_proxy
metadata
mongoose_im
nodeinfo
o_auth
o_status	Redirect non-local activities when /notice/:id is used	2021-02-04 15:17:40 +01:00
pleroma_api	OAuthScopesPlug: remove transform_scopes in favor of explicit admin scope definitions	2021-02-17 21:37:23 +03:00
plugs	OAuthScopesPlug: remove transform_scopes in favor of explicit admin scope definitions	2021-02-17 21:37:23 +03:00
preload/providers
push
rich_media
static_fe
templates	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-02-11 19:31:57 +03:00
twitter_api
views
web_finger
api_spec.ex	OpenAPI: Add admin: scope prefix to admin operations	2021-02-17 21:10:28 +03:00
chat_channel.ex
common_api.ex
controller_helper.ex
embed_controller.ex
endpoint.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 'feat/chat-list-pagination' into 'develop'	2021-02-17 15:36:59 +00:00
streamer.ex
translation_helpers.ex
uploader_controller.ex
web_finger.ex
xml.ex