1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-17 08:09:25 +09:00
Commit Graph

3 Commits

Author SHA1 Message Date
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
kibi!
60ff086960 Fixed improper mailer import 2018-01-15 21:23:26 -08:00
kibi!
cda845ae0e Fix mailer to use webpack core 2018-01-15 21:17:03 -08:00