Jeremy Kescher 2379efb52f Merge remote-tracking branch 'upstream/main' into reactions ... # Conflicts: # app/javascript/flavours/glitch/locales/de.js # app/javascript/flavours/glitch/locales/en.js # app/javascript/flavours/glitch/locales/fr.js # app/javascript/mastodon/actions/interactions.js # app/javascript/mastodon/locales/fr.json # config/locales-glitch/de.yml # config/locales-glitch/fr.yml # config/locales-glitch/simple_form.de.yml # config/locales-glitch/simple_form.fr.yml		2022-12-21 23:45:28 +01:00
..
core	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:49:42 +02:00
flavours	Merge remote-tracking branch 'upstream/main' into reactions	2022-12-21 23:45:28 +01:00
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
icons	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
images	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-01 21:00:16 +01:00
mastodon	Merge remote-tracking branch 'upstream/main' into reactions	2022-12-21 23:45:28 +01:00
packs	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
skins	initial translation of Glitch-specific texts into Czech (#1997)	2022-12-08 10:38:52 +01:00
styles	rebase with upstream	2022-12-20 18:27:51 +01:00