mirror of
https://github.com/glitch-soc/mastodon.git
synced 2026-03-28 17:50:01 +01:00
Conflicts: - `app/services/post_status_service.rb`: Upstream added a line adjacent to one that had been modified due to local-only posting. Added upstream's change. - `tsconfig.json`: Upstream updated Typescript and updated `tsconfig` in the process by changing paths, where glitch-soc had extra paths. Updated as upstream did.