vt-social/app/views/about
Claire 15929a3d59 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Our README is completely different. Discarded upstream changes.
- `app/javascript/packs/mailer.js`:
  We had removed the file. Move the changes to `app/javascript/core/mailer.js`.
2022-06-11 00:08:41 +02:00
..
_domain_blocks.html.haml
_logged_in.html.haml
_login.html.haml
_registration.html.haml
more.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-06-11 00:08:41 +02:00
show.html.haml
terms.html.haml