5fbe5fed1e
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 |