mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-27 10:30:15 -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. |
||
---|---|---|
.. | ||
admin | ||
filters | ||
notifications | ||
filters_controller.rb | ||
instances_controller.rb | ||
media_controller.rb | ||
notifications_controller.rb | ||
search_controller.rb | ||
suggestions_controller.rb |