Jeremy Kescher 9fe04326ea Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # config/routes.rb # db/schema.rb # lib/mastodon/version.rb		2023-05-09 23:26:00 +02:00
..
action_bar.jsx	Merge remote-tracking branch 'upstream/main' into develop	2023-03-28 17:31:34 +02:00
card.jsx	[Glitch] Change media elements to use aspect-ratio rather than compute height themselves	2023-05-08 22:15:00 +02:00
detailed_status.jsx	Merge remote-tracking branch 'upstream/main' into develop	2023-05-07 21:40:47 +02:00