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
..
account_container.jsx	Rename JSX files with proper .jsx extension (#23733)	2023-02-20 03:20:59 +01:00
admin_component.jsx	Rename JSX files with proper .jsx extension (#23733)	2023-02-20 03:20:59 +01:00
compose_container.jsx	Fixes build errors from some previous TS-related commits (#24811)	2023-05-03 16:28:14 +02:00
domain_container.jsx	Rename JSX files with proper .jsx extension (#23733)	2023-02-20 03:20:59 +01:00
dropdown_menu_container.js	Fix dropdown menu positions when scrolling (#22916)	2023-01-11 21:58:46 +01:00
intersection_observer_article_container.js	Fix height cache (#4909)	2017-09-13 10:24:33 +02:00
mastodon.jsx	use configureStore of redux-toolkit instead of createStore of redux (#24790)	2023-05-02 20:39:06 +02:00
media_container.jsx	Set marginRight as string (#24422)	2023-04-05 10:57:36 +02:00
poll_container.js	Fix not being able to vote (#13490)	2020-04-17 21:54:25 +02:00
scroll_container.js	Improve modal flow and back button handling (#16499)	2021-07-13 15:45:17 +02:00
status_container.jsx	Remove old makeCustomEmojiMap function	2023-05-09 21:43:21 +02:00