me/glitchier-soc - glitchier-soc - Gitea: Git with a cup of tea

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.	2 years ago
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`.	2 years ago
kibi!	60ff086960	Fixed improper mailer import	7 years ago
kibi!	cda845ae0e	Fix mailer to use webpack core	7 years ago