mirrors/mastodon
1
0
Fork 1
mirror of https://github.com/glitch-soc/mastodon synced 2025-09-12 17:21:12 +00:00
Code Issues Projects Releases Packages Wiki Activity
16033 commits 71 branches 37 tags 368 MiB
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