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] Fix unhandled nullable attachments limitation counter	2024-03-07 13:01:21 +01:00
util	Fix import order with ESLint	2023-05-28 16:38:10 +02:00
index.jsx	Add notification badge feature back	2024-02-23 21:05:34 +01:00