mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-28 22:56:36 +01:00
Conflicts: - `config/webpack/generateLocalePacks.js`: A dependency update changed how functions are imported. Also, some linting fixes not applicable to glitch-soc.