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)
commit614e47aa7c7f44249961213905860d3076326977
tree02f4173dd2d6c7540021df04a88b4e8943fc2f33
parentf7ba393bb94f29bb79bc34ff3c708f929f61cc57
parent497814cbbb4baea91b2882fbddd5cd8d5ad6e170
Merge branch 'revert-d31bbb1c' into 'develop'

Rich Text Redo Branch

See merge request pleroma/pleroma!314