mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-30 20:10:24 -05:00
665e9129fe
Conflicts: - `app/models/custom_emoji.rb`: An upstream refactor touched lines adjacent to ones modified in glitch-soc. Ported upstream's changes. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
v2_alpha | ||
web | ||
oembed_spec.rb |