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.
mastodon/app/javascript
Claire d8fdbb054e Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/validators/status_length_validator.rb`:
  Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real
  conflict.
  Applied upstream changes.
- `package.json`:
  glitch-soc-only dependency textually too close to a dependency updated
  upstream, not a real conflict.
  Applied upstream changes.
5 years ago
..
core Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
flavours [Glitch] Fix default searchTokens 5 years ago
fonts
images Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
locales
mastodon Merge branch 'main' into glitch-soc/merge-upstream 5 years ago
packs Add ability to require invite request text (#15326) 5 years ago
skins Glitchsoc translation to 'es' language (#1439) 5 years ago
styles Merge branch 'main' into glitch-soc/merge-upstream 5 years ago