Jeremy Kescher 4a6cc45f9d Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile # Gemfile.lock # config/sidekiq.yml		2023-02-18 22:38:53 +01:00
..
core	[Glitch] Run eslint --fix	2023-02-03 20:52:07 +01:00
flavours	Merge remote-tracking branch 'upstream/main' into develop	2023-02-18 22:38: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-02-18 22:38:53 +01:00
packs	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-03 19:23:27 +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-02-18 22:38:53 +01:00