mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-23 05:37:47 +00:00
60abcb3c4c
Conflicts: - `config/i18n-tasks.yml`: Upstream added new ignored strings, glitch-soc has extra ignored strings because of the theming system. Added upstream's changes. |
||
---|---|---|
.. | ||
actions | ||
_actions.html.haml | ||
_media_attachments.html.haml | ||
_status.html.haml | ||
index.html.haml | ||
show.html.haml |