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
..
about	Consolidate inclusion of admin js pack link (#26628)	2023-08-24 09:56:23 +02:00
appearance	Fix HAML linting issue	2023-12-17 16:37:11 +01:00
branding	Consolidate inclusion of admin js pack link (#26628)	2023-08-24 09:56:23 +02:00
content_retention	Consolidate inclusion of admin js pack link (#26628)	2023-08-24 09:56:23 +02:00
discovery	Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream	2023-12-20 20:10:45 +01:00
other	Fix blurhash for GlitchSoc	2024-02-24 11:14:32 +01:00
registrations	Change registrations to be disabled by default for new servers (#29280)	2024-02-22 13:28:19 +00:00
shared	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-19 07:35:51 +02:00