Merge upstream changes up to e0648a916ab81925545504173bf4f43ec64d4f3c

glitch-soc / mastodon

A glitchy but lovable microblogging server

https://glitch-soc.github.io/docs/

GNU Affero General Public License v3.0

708 stars 182 forks source link

Closed ClearlyClaire closed 2 months ago

ClearlyClaire commented 2 months ago

app/models/custom_emoji.rb: An upstream refactor touched lines adjacent to ones modified in glitch-soc. Ported upstream's changes.