Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts: # packages/backend/src/models/RepositoryModule.ts # packages/backend/src/models/_.ts # packages/backend/src/postgres.ts # packages/frontend/src/components/MkDrive.file.vue # packages/frontend/src/components/MkEmojiPicker.vue # packages/frontend/src/pages/admin/index.vue # packages/frontend/src/pages/user/home.vue # packages/frontend/src/router.ts # packages/frontend/src/ui/universal.vue
This commit is contained in:
commit
33507e24ff
157 changed files with 3973 additions and 2059 deletions
|
|
@ -511,6 +511,13 @@ export const defaultStore = markRaw(new Storage('base', {
|
|||
where: 'device',
|
||||
default: false,
|
||||
},
|
||||
dropAndFusion: {
|
||||
where: 'device',
|
||||
default: {
|
||||
bgmVolume: 0.25,
|
||||
sfxVolume: 1,
|
||||
},
|
||||
},
|
||||
|
||||
sound_masterVolume: {
|
||||
where: 'device',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue