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
..
action_bar.jsx	Merge branch 'glitch-soc' into develop	2024-03-14 20:01:30 +01:00
card.jsx	[Glitch] Fix preview card player getting embedded when clicking on the external link button	2024-02-29 18:29:57 +01:00
detailed_status.jsx	Merge branch 'glitch-soc' into develop	2024-03-03 03:12:37 +01:00