Jeremy Kescher 009251a17d Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/mastodon/features/ui/components/navigation_panel.jsx # app/javascript/mastodon/initial_state.js # app/serializers/initial_state_serializer.rb # config/initializers/chewy.rb # config/locales/en.yml # config/locales/ja.yml		2024-02-24 19:11:05 +01:00
..
components	Merge branch 'glitch-soc' into develop	2024-02-24 17:51:18 +01:00
containers	[Glitch] Change onboarding prompt to follow suggestions carousel in web UI	2024-02-24 14:35:08 +01:00
util	[Glitch] Use a context to propagate column-related Props, and remove forceUpdate usage	2024-01-14 14:31:49 +01:00
index.jsx	Merge branch 'glitch-soc' into develop	2024-02-24 19:11:05 +01:00