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
..
_custom_emoji.html.haml	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +02:00
index.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-26 13:02:14 +02:00
new.html.haml	Fix incorrect upload size limit at /admin/custom_emojis/new in glitch-soc (#1763)	2022-05-05 19:11:56 +02:00