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	Change onboarding prompt to follow suggestions carousel in web UI (#28878)	2024-02-01 13:37:04 +00:00
util	Hide media by default in notification requests (#29572)	2024-03-13 16:47:48 +00:00
index.jsx	Merge branch 'glitch-soc' into develop	2024-03-14 20:01:30 +01:00