Jeremy Kescher 0353a3d759 Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx # app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx # app/javascript/mastodon/features/ui/components/navigation_panel.jsx		2024-03-20 22:59:13 +01:00
..
components	Merge branch 'glitch-soc' into develop	2024-03-20 22:59:13 +01:00
containers	Reduce differences with upstream due to import style (#2465)	2023-11-15 12:01:51 +01:00
index.jsx	Merge branch 'glitch-soc' into develop	2024-01-17 22:37:29 +01:00