Merge branch 'feature/notification-control-part-2' into 'develop'
authorkaniini <nenolod@gmail.com>
Sun, 2 Jun 2019 08:25:37 +0000 (08:25 +0000)
committerkaniini <nenolod@gmail.com>
Sun, 2 Jun 2019 08:25:37 +0000 (08:25 +0000)
notification controls, part 2

See merge request pleroma/pleroma!1204

1  2 
lib/pleroma/user/info.ex

Simple merge