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
..
appearance	Merge remote-tracking branch 'upstream/main' into develop	2023-04-03 21:50:15 +02:00
notifications	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-31 21:30:27 +02:00
other	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-31 21:30:27 +02:00