Jeremy Kescher 122870cb6b Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # config/initializers/rack_attack.rb # lib/mastodon/version.rb		2022-11-14 22:18:48 +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 develop	2022-11-14 22:18:48 +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-11-12 13:28:03 +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	2022-11-14 22:18:48 +01:00
packs	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-30 18:15:28 +01:00
skins	Add Oatstodon glitch flavour	2022-08-27 10:49:42 +02:00
styles	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00