Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
# Conflicts:
#	package.json
#	packages/backend/src/core/QueueService.ts
#	packages/frontend/src/components/global/MkPageHeader.vue
#	packages/frontend/src/pages/admin/index.vue
#	packages/frontend/src/pages/clicker.vue
#	packages/frontend/src/pages/my-lists/index.vue
#	packages/frontend/src/pages/notifications.vue
#	packages/frontend/src/pages/settings/emoji-picker.vue
#	packages/frontend/src/pages/settings/mute-block.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/ui/universal.vue
#	pnpm-lock.yaml
This commit is contained in:
mattyatea 2024-02-16 19:40:51 +09:00
commit 2b52a215e5
238 changed files with 3369 additions and 3002 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packages/frontend/src/pages/drop-and-fusion.vue
View file

@ -126,10 +126,10 @@ function onGameEnd() {
gameStarted.value = false;
}
definePageMetadata({
definePageMetadata(() => ({
title: i18n.ts.bubbleGame,
icon: 'ti ti-device-gamepad',
});
}));
</script>
<style lang="scss" module>