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
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
..
chewy
controllers Merge branch 'main' into glitch-soc/merge-upstream 5 years ago
helpers Merge branch 'main' into glitch-soc/merge-upstream 5 years ago
javascript Merge branch 'main' into glitch-soc/merge-upstream 5 years ago
lib Merge branch 'main' into glitch-soc/merge-upstream 5 years ago
mailers
models Merge branch 'main' into glitch-soc/merge-upstream 5 years ago
policies Merge branch 'main' into glitch-soc/merge-upstream 5 years ago
presenters Merge branch 'main' into glitch-soc/merge-upstream 5 years ago
serializers Merge branch 'main' into glitch-soc/merge-upstream 5 years ago
services Merge branch 'main' into glitch-soc/merge-upstream 5 years ago
validators Merge branch 'main' into glitch-soc/merge-upstream 5 years ago
views Merge branch 'main' into glitch-soc/merge-upstream 5 years ago
workers Merge branch 'master' into glitch-soc/merge-upstream 5 years ago