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	[Glitch] Rename JSX files with proper .jsx extension	2023-02-25 14:35:31 +01:00
admin_component.jsx	[Glitch] Rename JSX files with proper .jsx extension	2023-02-25 14:35:31 +01:00
compose_container.jsx	[Glitch] Fixes build errors from some previous TS-related commits	2023-05-08 22:15:00 +02:00
domain_container.jsx	Fix some more Javascript linting issues and discrepancies with upstream (#2209)	2023-05-07 21:43:25 +02:00
dropdown_menu_container.js	[Glitch] Fix dropdown menu positions when scrolling	2023-01-12 11:18:22 +01:00
intersection_observer_article_container.js	Rename themes -> flavours ? ?	2017-12-03 23:26:40 -08:00
mastodon.jsx	[Glitch] use configureStore of redux-toolkit instead of createStore of redux	2023-05-08 22:15:00 +02:00
media_container.jsx	[Glitch] Set marginRight as string	2023-04-09 11:59:42 +02:00
notification_purge_buttons_container.js	Rename themes -> flavours ? ?	2017-12-03 23:26:40 -08:00
poll_container.js	[Glitch] Fix not being able to vote	2020-04-17 22:04:10 +02:00
scroll_container.js	Please CodeClimate	2021-07-13 13:49:40 +02:00
status_container.js	Merge remote-tracking branch 'upstream/main' into develop	2023-05-08 00:40:33 +02:00