Jeremy Kescher 6d448d46ff Merge branch 'refs/heads/glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/actions/interactions.js # app/javascript/flavours/glitch/reducers/statuses.js		2024-05-29 14:23:08 +02:00
..
account_container.jsx	[Glitch] Remove setting for unfollow confirmation modal, and make it unconditional	2024-04-06 21:17:45 +02:00
admin_component.jsx	[Glitch] Fix /share and cleanup and reorganize frontend locale loading	2023-06-10 16:18:01 +02:00
compose_container.jsx	[Glitch] Change design of compose form in web UI	2024-02-22 23:06:12 +01:00
domain_container.jsx	[Glitch] Rewrite actions/modal and reducers/modal with typescript	2023-05-28 17:49:55 +02:00
dropdown_menu_container.js	Reduce differences with upstream due to import style (#2465)	2023-11-15 12:01:51 +01:00
intersection_observer_article_container.js	Reduce differences with upstream due to import style (#2465)	2023-11-15 12:01:51 +01:00
mastodon.jsx	[Glitch] Use a modern React context for identity in the app	2024-05-20 12:53:52 +02:00
media_container.jsx	[Glitch] Use modern ES syntax rather than .call	2024-02-28 20:11:26 +01:00
notification_purge_buttons_container.js	[Glitch] Rewrite actions/modal and reducers/modal with typescript	2023-05-28 17:49:55 +02:00
poll_container.js	Fix import order with ESLint	2023-05-28 16:38:10 +02:00
scroll_container.js	Please CodeClimate	2021-07-13 13:49:40 +02:00
status_container.js	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-29 14:23:08 +02:00