mastodon/app/views/about
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.
2021-03-02 12:06:58 +01:00
..
_domain_blocks.html.haml Add option to obfuscate domain name in public list of domain blocks (#15355) 2020-12-18 08:30:41 +01:00
_login.html.haml
_registration.html.haml Add ability to require invite request text (#15326) 2020-12-14 10:03:09 +01:00
more.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2021-03-02 12:06:58 +01:00
show.html.haml Fix some account avatars on public pages having incorrect size (#13692) 2020-05-13 21:20:34 +02:00
terms.html.haml