mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-11 05:23:14 -08:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit '01ce9df880' into glitch-soc/merge-upstream

Browse source 
Conflicts:
- `tsconfig.json`:
  Upstream made style fixes, while glitch-soc had extra options.
  Ported upstream's style fixes.
This commit is contained in:
Claire 2024-01-24 20:42:53 +01:00
commit 22cfab0ebf
63 changed files with 291 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tsconfig.json
View file

@ -20,14 +20,14 @@
"flavours/glitch/*": ["app/javascript/flavours/glitch/*"],
"mastodon": ["app/javascript/mastodon"],
"mastodon/*": ["app/javascript/mastodon/*"],
"@/*": ["app/javascript/*"]
}
"@/*": ["app/javascript/*"],
},
},
"include": [
"app/javascript/mastodon",
"app/javascript/packs",
"app/javascript/types",
"app/javascript/flavours/glitch",
"app/javascript/core"
]
"app/javascript/core",
],
}