lain d9bf2c58df Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration		2020-07-29 14:42:09 +02:00
..
controllers	AccountController: Don't explicitly ask to keep users unconfirmed.	2020-07-29 11:47:03 +02:00
views	Merge remote-tracking branch 'upstream/develop' into by-approval	2020-07-26 15:46:14 -05:00
mastodon_api.ex	NotificationController: Don't return chat_mentions by default.	2020-06-02 14:05:53 +02:00
websocket_handler.ex	Expand and authorize streams in Streamer directly	2020-05-12 18:04:47 +02:00