You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
nyastodon/app/javascript
Claire 9a3d91f629 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/concerns/domain_materializable.rb`:
  Fixed a code style issue upstream in a PR that got merged in glitch-soc
  earlier.
  Changed the code to match upstream's.
1 year ago
..
core Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
flavours Fix content-type being reset when editing toots (#1993) 1 year ago
fonts Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
icons png optimization(loss less) (#19630) 2 years ago
images Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
locales Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
mastodon Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
packs Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
skins Glitchsoc translation to 'es' language (#1439) 4 years ago
styles Merge branch 'main' into glitch-soc/merge-upstream 1 year ago