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
..
action_bar.jsx	Merge branch 'glitch-soc' into develop	2024-03-14 20:01:30 +01:00
card.jsx	[Glitch] Fix preview card player getting embedded when clicking on the external link button	2024-02-29 18:29:57 +01:00
detailed_status.jsx	Merge branch 'glitch-soc' into develop	2024-03-20 22:59:13 +01:00