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
..
components	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-20 23:57:04 +02:00
containers	Change onboarding prompt to follow suggestions carousel in web UI (#28878)	2024-02-01 13:37:04 +00:00
util	Change mute, block and domain block confirmations in web UI (#29576)	2024-03-15 17:36:41 +00:00
index.jsx	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-20 23:57:04 +02:00