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
..
glitch	Merge branch 'glitch-soc' into develop	2024-02-24 19:11:05 +01:00
vanilla	Remove redundant asset preload (#2488)	2023-12-02 14:54:26 +01:00