Jeremy Kescher 68101baae1 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # app/controllers/settings/preferences_controller.rb # app/javascript/mastodon/utils/resize_image.js # app/lib/user_settings_decorator.rb # app/models/media_attachment.rb # app/models/user.rb # app/views/settings/preferences/appearance/show.html.haml # app/workers/scheduler/indexing_scheduler.rb # config/settings.yml # db/schema.rb		2023-04-03 21:50:15 +02:00
..
core	[Glitch] Run eslint --fix	2023-02-03 20:52:07 +01:00
flavours	Merge remote-tracking branch 'upstream/main' into develop	2023-04-03 21:50:15 +02: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-04-03 21:50:15 +02:00
packs	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-25 14:00:40 +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-04-03 21:50:15 +02:00