Jeremy Kescher caccc2e0f4 Merge branch 'glitch-soc' into develop ... # Conflicts: # README.md # app/javascript/flavours/glitch/components/status.jsx # app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx # app/javascript/flavours/glitch/locales/en.json # app/javascript/flavours/glitch/reducers/compose.js # app/javascript/flavours/glitch/styles/components.scss # app/javascript/mastodon/reducers/compose.js # app/models/notification.rb		2024-03-14 20:01:30 +01:00
..
components	Merge branch 'glitch-soc' into develop	2024-03-14 20:01:30 +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