projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e128a6 48cd336)
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)
Upstream external emoji support

See merge request pleroma/pleroma!3238


Trivial merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git