Merge remote-tracking branch 'refs/remotes/misskey-original/develop' into develop

# Conflicts: # packages/frontend/src/components/MkFollowButton.vue
2024-04-24 03:50:09 +09:00 · 2024-04-24 03:50:09 +09:00 · 41e735906a
commit 41e735906a
parent 814eea2513 f9aed8f2bf
35 changed files with 892 additions and 257 deletions
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@ -716,6 +716,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: true,
 	},
+	alwaysConfirmFollow: {
+		where: 'device',
+		default: true,
+	},

 	sound_masterVolume: {
 		where: 'device',