mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-29 03:20:26 -05:00
44a5f1b64a
Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore. - `README.md`: Upstream updated its README, but glitch-soc has a completely different one. Kept glitch-soc's README |
||
---|---|---|
.. | ||
_instance.html.haml | ||
index.html.haml | ||
show.html.haml |