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
..
core	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
flavours	[Glitch] Add administrative webhooks	2022-06-10 17:04:02 +02:00
fonts
icons	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +02:00
images	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-01 21:00:16 +01:00
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-10 11:51:43 +02:00
packs	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +02:00
skins	Glitchsoc translation to 'es' language (#1439)	2020-10-19 22:17:29 +02:00
styles	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00