Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '31abef8917879917a330419fe3981a2fb7f35b69' into glitch-soc/merge-upstream

Browse Source 
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.
This commit is contained in:
Claire
2026-03-25 21:36:32 +01:00
parent 24bc05f3a4 31abef8917
commit 79958d9442
209 changed files with 2115 additions and 1265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
streaming/package.json
View File

@@ -38,7 +38,7 @@
"@types/ws": "^8.5.9",
"globals": "^17.3.0",
"pino-pretty": "^13.0.0",
"typescript": "~5.9.0",
"typescript": "~6.0.0",
"typescript-eslint": "^8.55.0"
},
"optionalDependencies": {