You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Ivan Tashkinov 0bda85857e Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy ... # Conflicts: # lib/pleroma/instances/instance.ex		4 years ago
..
controllers	Merge branch 'fix/2095-deactivated-account-reset' into 'develop'	4 years ago
views	Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy	4 years ago
mastodon_api.ex	NotificationController: Don't return chat_mentions by default.	4 years ago
websocket_handler.ex	Websocket handler: fix never matching code on failed auth	4 years ago