catstodon/app/javascript/mastodon/features/status/components
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-04-03 21:50:15 +02:00
card.jsx Change media elements to use aspect-ratio rather than compute height themselves (#24686) 2023-05-02 13:58:48 +02:00
detailed_status.jsx Merge remote-tracking branch 'upstream/main' into develop 2023-04-03 21:50:15 +02:00