4 Commits (566b41cc3bb5c079e7220132c089a7fb0890c4be)

Author	SHA1	Message	Date
Claire	5c4a012ac5	Merge commit '85b3823e6638719511f705ecdd7e5ba09248cf2f' 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	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