Merge branch 'notification-pleroma-settings' into 'develop'
authorkaniini <nenolod@gmail.com>
Wed, 10 Apr 2019 02:10:31 +0000 (02:10 +0000)
committerkaniini <nenolod@gmail.com>
Wed, 10 Apr 2019 02:10:31 +0000 (02:10 +0000)
commit97395e013e5dac84399769438f8b90cffa38afd5
tree1429546e8d412f5c52b5be77115c87f1bbb831a5
parent144648de92abea7330cf264b7608634a27bb6bdf
parentcd90695a349f33b84f287794bae6070e9eec446a
Merge branch 'notification-pleroma-settings' into 'develop'

Notification controls

Closes #738

See merge request pleroma/pleroma!988
docs/api/pleroma_api.md
lib/pleroma/user.ex
lib/pleroma/web/router.ex
lib/pleroma/web/twitter_api/controllers/util_controller.ex
test/web/twitter_api/util_controller_test.exs