Merge branch 'feature/rich-text' into 'develop'
authorkaniini <nenolod@gmail.com>
Fri, 31 Aug 2018 03:41:00 +0000 (03:41 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 31 Aug 2018 03:41:00 +0000 (03:41 +0000)
commita26d5e6b2aba5010c699df659d63048957b347a5
tree0b7a68d223d2663c6aa64d8f3144dee1705e4e4f
parente838969495d2ca95406920ceef98d08f01d71192
parente7871ed05e9ebc8e2fe2f1afe966285e767c682f
Merge branch 'feature/rich-text' into 'develop'

rich text support

See merge request pleroma/pleroma!309