Jeremy Kescher fae98d1deb Merge branch 'refs/heads/glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/initial_state.js # app/javascript/mastodon/initial_state.js		2024-05-20 23:57:04 +02:00
..
action_bar.jsx	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-20 23:57:04 +02: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-20 22:59:13 +01:00