Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'f89512fbedb547f66a72eefdff047768fb505eb6' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept our version.
This commit is contained in:
Claire
2024-03-05 16:25:50 +01:00
parent 74998b0636 f89512fbed
commit 45e56db8e4
14 changed files with 598 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
streaming/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "@mastodon/streaming",
"license": "AGPL-3.0-or-later",
"packageManager": "yarn@4.1.0",
"packageManager": "yarn@4.1.1",
"engines": {
"node": ">=18"
},