Merge branch 'develop' into openapi/notifications
authorEgor Kislitsyn <egor@kislitsyn.com>
Thu, 30 Apr 2020 09:52:07 +0000 (13:52 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Thu, 30 Apr 2020 09:52:07 +0000 (13:52 +0400)
commit9c1adb35dea9a4e86b68b98558b85de7210d563e
tree87f74883eb4f5cd07dd8fa363dcddc473524714f
parent5238ae3dd3bfba9ff84d5f47e2419227fc7c5d9a
parentdae91630606d6ba408b3f340b6b450703c164ce1
Merge branch 'develop' into openapi/notifications
lib/pleroma/web/api_spec/operations/account_operation.ex
lib/pleroma/web/mastodon_api/controllers/notification_controller.ex
lib/pleroma/web/router.ex