Merge branch 'revert-d31bbb1c' into 'develop'
authorkaniini <nenolod@gmail.com>
Fri, 5 Oct 2018 21:17:46 +0000 (21:17 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 5 Oct 2018 21:17:46 +0000 (21:17 +0000)
Rich Text Redo Branch

See merge request pleroma/pleroma!314


Trivial merge