fef/nyastodon
1
1
Fork 0
forked from mirrors/catstodon
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge commit '3b3144740805c1b404934c0f196d6cddc14dac0b' into glitch-soc/merge-upstream

Browse source 
Conflicts:
- `package.json`:
  Conflict due to lines adjacent to the glitch-soc-modified `i18n:extract` one
  were changed, but otherwise no real conflict.
  Ported upstream's changes and kept glitch-soc's `i18n:extract`.
- `tsconfig.json`:
  Upstream's dependencies changed the code style rules for json formatting, and
  we had local changes.
  Kept our changes, but with upstream's formatting/
- `yarn.lock`:
  A dependency textually adjacent to a glitch-soc-only one got changed.
  Applied upstream's change, keeping the glitch-soc-only dependency.
This commit is contained in:
Claire 2024-02-28 20:27:28 +01:00
commit 21e7a53ca5
15 changed files with 120 additions and 407 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
.devcontainer/codespaces/devcontainer.json
View file

Internal server error - The gay git

500

Internal server error

Forgejo version: 9.0.3

 @ -5,7 +5,7 @@