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	[Glitch] Add notification policies and notification requests in web UI	2024-03-13 18:38:46 +01:00
index.jsx	[Glitch] Add notification policies and notification requests in web UI	2024-03-13 18:38:46 +01:00
request.jsx	[Glitch] Change filtered icon from “archive” to “inventory 2”	2024-03-19 19:35:17 +01:00
requests.jsx	[Glitch] Change filtered icon from “archive” to “inventory 2”	2024-03-19 19:35:17 +01:00