Merge branch 'develop' into feature/user-status-subscriptions
authorSadposter <hannah+pleroma@coffee-and-dreams.uk>
Wed, 10 Apr 2019 09:44:54 +0000 (10:44 +0100)
committerSadposter <hannah+pleroma@coffee-and-dreams.uk>
Wed, 10 Apr 2019 09:44:54 +0000 (10:44 +0100)
commitbe8350baa2f8c9cf9be3f53ee4a0041dada1386f
tree8414fc2108941ccadd9b9fd4dd37c9d3cf731399
parent589629cf3e1bee9a4f6e92b8456d8614eff73c89
parentc8440b5e0c97c5d5c03e4b99e30a61df6ab95319
Merge branch 'develop' into feature/user-status-subscriptions
12 files changed:
docs/api/pleroma_api.md
lib/pleroma/notification.ex
lib/pleroma/user.ex
lib/pleroma/user/info.ex
lib/pleroma/web/common_api/utils.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/mastodon_api/views/account_view.ex
lib/pleroma/web/router.ex
test/notification_test.exs
test/user_test.exs
test/web/mastodon_api/account_view_test.exs
test/web/mastodon_api/mastodon_api_controller_test.exs