mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-13 15:58:50 +00:00
Conflicts: - `tsconfig.json`: Upstream added config for storybook files, while glitch-soc had an addition for the glitch flavor on the last line. Added upstream's new config. - `yarn.lock`: Upstream added a new dependency to an `eslint` plugin textually adjacent to a couple glitch-only-dependencies. Added upstream's new dependency.