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	Change onboarding prompt to follow suggestions carousel in web UI (#28878)	2024-02-01 13:37:04 +00:00
util	Change mute, block and domain block confirmations in web UI (#29576)	2024-03-15 17:36:41 +00:00
index.jsx	Merge branch 'glitch-soc' into develop	2024-03-14 20:01:30 +01:00