pleroma/lib/pleroma/web/mastodon_api
Ivan Tashkinov 0062116e07 Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
# Conflicts:
#	lib/pleroma/web/mastodon_api/controllers/account_controller.ex
2020-04-22 18:51:59 +03:00
..
controllers Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks 2020-04-22 18:51:59 +03:00
views Polls: Persist and show voters' count 2020-04-22 14:06:39 +02:00
mastodon_api.ex include_types parameter in /api/v1/notifications 2020-03-20 13:18:12 +03:00
websocket_handler.ex Update Copyrights 2020-03-03 16:44:49 -06:00