Merge branch 'upstream/remote-emoji-support' into 'develop'
authorlain <lain@soykaf.club>
Thu, 7 Jan 2021 10:06:39 +0000 (10:06 +0000)
committerlain <lain@soykaf.club>
Thu, 7 Jan 2021 10:06:39 +0000 (10:06 +0000)
commitf1ca2ac64bf5a308401f3155360e94a058e99e4e
tree283c7bdbeff9e3bb0a65b9cea1b459f76daaf88d
parent5e128a6be30563adc3b8a938aa68d18ac04cdfa0
parent48cd336a720086695613decc2a1a6852245c1df5
Merge branch 'upstream/remote-emoji-support' into 'develop'

Upstream external emoji support

See merge request pleroma/pleroma!3238