Merge branch 'runtime-emojis-fix-finmoji-return' into 'develop'
authorkaniini <nenolod@gmail.com>
Tue, 6 Nov 2018 07:33:27 +0000 (07:33 +0000)
committerkaniini <nenolod@gmail.com>
Tue, 6 Nov 2018 07:33:27 +0000 (07:33 +0000)
commit0f75ed33f94faca8cb370b91f9a32b7aa6f4c420
tree044df83f0f9d3dbee4c2df7287d1e3b347e268d8
parent03702e4c4a3f7ca80d6adcdcd77b39e6a60809c6
parent83911b1443c99d3f8c6784a57d8327a22c05e606
Merge branch 'runtime-emojis-fix-finmoji-return' into 'develop'

Runtime emojis: Fix wrong return when finmoji is disabled

See merge request pleroma/pleroma!427