rubiline
/
Glitch-Shrike
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,831 Commits
3 Branches
0 Tags
276 MiB
Commit Graph

4 Commits (0f8ddf367c706f4dee7faf5001b83f492fd9fc73)

Author SHA1 Message Date
Claire c81d1b0d38 Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.
- `app/javascript/packs/public.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.
 2023-05-09 22:12:05 +02:00
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