Merge branch 'revert-a26d5e6b' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Fri, 31 Aug 2018 09:53:00 +0000 (09:53 +0000)
committerlambda <pleromagit@rogerbraun.net>
Fri, 31 Aug 2018 09:53:00 +0000 (09:53 +0000)
Revert "Merge branch 'feature/rich-text' into 'develop'"

See merge request pleroma/pleroma!313


Trivial merge