honkoma/lib/pleroma/web/mastodon_api
Ivan Tashkinov 61180ab6f4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
#	config/config.exs
#	lib/pleroma/web/media_proxy/media_proxy.ex
#	lib/pleroma/web/media_proxy/media_proxy_controller.ex
2020-07-02 16:36:54 +03:00
..
controllers AccountController: Extract blocking to CommonAPI. 2020-06-25 11:44:04 +02:00
views Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy 2020-07-02 16:36:54 +03: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