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

# Conflicts: # package.json # packages/frontend/src/components/MkPostForm.vue # packages/frontend/src/ui/_common_/navbar.vue
2023-10-22 19:47:55 +09:00 · 2023-10-22 19:47:55 +09:00 · cf14d90f50
commit cf14d90f50
parent fc0b1abfdc 230b4318bd
15 changed files with 76 additions and 40 deletions
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@ -332,6 +332,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: false,
 	},
+	showAvatarDecorations: {
+		where: 'device',
+		default: true,
+	},
 	postFormWithHashtags: {
 		where: 'device',
 		default: false,