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)
commitd31bbb1cfe04ca6073a322bcf77239e7d4b79839
treeba9a5a9e33b4afb79044c5d8da663b150010bd68
parent340ab3cb9068d444b77213e07beb8c2c3ca128b9
parent58539e13573681238fdd4d4e7334666389084be3
Merge branch 'revert-a26d5e6b' into 'develop'

Revert "Merge branch 'feature/rich-text' into 'develop'"

See merge request pleroma/pleroma!313