mirror of
https://github.com/funamitech/mastodon
synced 2024-12-13 22:29:07 +09: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. |
||
---|---|---|
.. | ||
components | ||
containers | ||
util | ||
index.js |