Jeremy Kescher 48373a71e3 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/components/status_action_bar.js # app/javascript/flavours/glitch/containers/status_container.js # app/javascript/flavours/glitch/features/status/components/action_bar.js # app/javascript/flavours/glitch/locales/de.json # app/javascript/flavours/glitch/locales/fr.json # app/javascript/mastodon/components/status_action_bar.js # app/javascript/mastodon/features/status/components/action_bar.js # config/locales-glitch/de.yml # config/locales-glitch/fr.yml # config/locales-glitch/simple_form.de.yml # config/locales-glitch/simple_form.fr.yml		2023-01-05 23:29:53 +01:00
..
core	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
flavours	Merge remote-tracking branch 'upstream/main' into develop	2023-01-05 23:29:53 +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 develop	2023-01-05 23:29:53 +01:00
packs	Fix “Add new domain block” button using last submitted instead of current search value (#22485)	2023-01-05 13:42:38 +01:00
skins	Merge remote-tracking branch 'upstream/main' into develop	2022-12-09 14:47:08 +01:00
styles	Merge remote-tracking branch 'upstream/main' into develop	2023-01-05 23:29:53 +01:00