Commit graph

3 commits

Author SHA1 Message Date
Claire
03846ad6c2 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
kibi!
89e8f9549b Fixed improper mailer import 2018-01-15 21:23:26 -08:00
kibi!
be525dd4db Fix mailer to use webpack core 2018-01-15 21:17:03 -08:00