Merge branch 'revert-10744d91' into 'master'
authorkaniini <nenolod@gmail.com>
Thu, 17 Jan 2019 23:04:20 +0000 (23:04 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 17 Jan 2019 23:04:20 +0000 (23:04 +0000)
commit79d127595bb9c42a39d82ac0c89549f5a626b442
treea81b42a0ff4b952ce33ac6723fea2f608e73a55d
parent10744d9191064dd8170543e59293c1ccfede0351
parent44faf30162c06ad89660fe0b0ee5444aa1505da3
Merge branch 'revert-10744d91' into 'master'

Revert "Merge branch 'fix-html' into 'master'"

See merge request pleroma/relay!9