From: lain <lain@soykaf.club>
Date: Thu, 7 Jan 2021 10:06:39 +0000 (+0000)
Subject: Merge branch 'upstream/remote-emoji-support' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=f1ca2ac64bf5a308401f3155360e94a058e99e4e;p=akkoma

Merge branch 'upstream/remote-emoji-support' into 'develop'

Upstream external emoji support

See merge request pleroma/pleroma!3238
---

f1ca2ac64bf5a308401f3155360e94a058e99e4e