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 19:11:05 +01:00
containers	[Glitch] Fix pixel alignment for some composer icons	2024-02-24 15:53:42 +01:00
util	Fix import order with ESLint	2023-05-28 16:38:10 +02:00
index.jsx	Add notification badge feature back	2024-02-23 21:05:34 +01:00