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

Merge remote-tracking branch 'misskey-dev/develop' into prismisskey

Browse source 
# Conflicts:
#	packages/backend/src/server/api/stream/channels/global-timeline.ts
#	packages/backend/src/server/api/stream/channels/home-timeline.ts
#	packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
#	packages/backend/src/server/api/stream/channels/local-timeline.ts
#	packages/frontend/src/pages/settings/general.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/ui/deck/deck-store.ts
This commit is contained in:
mattyatea 2023-09-28 16:11:39 +09:00
commit 81f56f08b7
31 changed files with 275 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

3
packages/frontend/src/components/MkVisitorDashboard.vue
View file

@ -114,8 +114,7 @@ function showMenu(ev) {
}
function exploreOtherServers() {
// TODO: 言語をよしなに
window.open('https://join.misskey.page/ja-JP/instances', '_blank');
window.open('https://join.misskey.page/instances', '_blank');
}
</script>