merge: upstream

2023-10-31 19:33:24 +01:00
parent c491385f2e bf01c1ee64
commit 4dd23a3793
217 changed files with 6773 additions and 2275 deletions
@@ -301,6 +301,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: true,
 	},
+	showAvatarDecorations: {
+		where: 'device',
+		default: true,
+	},
 	postFormWithHashtags: {
 		where: 'device',
 		default: false,
@@ -381,6 +385,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'account',
 		default: false,
 	},
+	disableStreamingTimeline: {
+		where: 'device',
+		default: false,
+	},
 }));

 // TODO: 他のタブと永続化されたstateを同期