Merge branch 'config/fe-collapse-subject' into 'develop'
authorkaniini <nenolod@gmail.com>
Fri, 24 Aug 2018 18:27:43 +0000 (18:27 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 24 Aug 2018 18:27:43 +0000 (18:27 +0000)
commit9ded0ee1a5ac5b60dfca983fee3875690336fa70
treefa40437704dd3243712f2b1d3ece70cce34b43ea
parentcac0bd6d51ac04bb9623d3b8f3a157c0a92291b6
parent09cb40220336f464e63ad4f56370c284028ccc94
Merge branch 'config/fe-collapse-subject' into 'develop'

fe config: add collapse_message_with_subject fe option

See merge request pleroma/pleroma!289