Ivan Tashkinov 0bda85857e Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy ... # Conflicts: # lib/pleroma/instances/instance.ex		2020-09-11 17:19:58 +03:00
..
controllers	Merge branch 'fix/2095-deactivated-account-reset' into 'develop'	2020-09-02 17:11:24 +00:00
views	Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy	2020-09-11 17:19:58 +03:00
mastodon_api.ex	NotificationController: Don't return chat_mentions by default.	2020-06-02 14:05:53 +02:00
websocket_handler.ex	Websocket handler: fix never matching code on failed auth	2020-09-10 21:26:52 +03:00