Jeremy Kescher 7122d5381c Merge branch 'refs/heads/glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/features/notifications/components/notification.jsx		2024-04-06 21:03:55 +02:00
..
components	Merge branch 'refs/heads/glitch-soc' into develop	2024-04-06 21:03:55 +02:00
containers	Refactor notifications code to reduce differences with upstream (#2692)	2024-04-06 19:34:30 +02: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