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)
commit5402d04e3cd2d45472092942fec2c9302c48f64f
tree1660d3314df49577102f26ec2025207953ff2306
parente706b42f519fe754af980fc758be492b24e3ccde
parent45e4642a58f5299d2cd3f142aea110a474eb477f
Merge branch 'feature/notification-control-part-2' into 'develop'

notification controls, part 2

See merge request pleroma/pleroma!1204
lib/pleroma/user/info.ex