Jeremy Kescher 7318b74ebf Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/models/notification.rb # config/locales/simple_form.de.yml		2023-03-05 12:34:16 +01: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] Rename JSX files with proper .jsx extension	2023-02-25 14:35:31 +01:00
domain_container.jsx	[Glitch] Rename JSX files with proper .jsx extension	2023-02-25 14:35:31 +01: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] Rename JSX files with proper .jsx extension	2023-02-25 14:35:31 +01:00
media_container.jsx	[Glitch] Rename JSX files with proper .jsx extension	2023-02-25 14:35:31 +01: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-01-05 23:29:53 +01:00