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	Reduce differences with upstream due to import style (#2465)	2023-11-15 12:01:51 +01:00
index.jsx	Merge branch 'glitch-soc' into develop	2024-01-17 22:37:29 +01:00