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. |
||
---|---|---|
.. | ||
_announcement.html.haml | ||
edit.html.haml | ||
index.html.haml | ||
new.html.haml |