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

7.8 KiB

Raw Blame History

View Raw