merge: all upstream changes

2023-10-13 19:01:17 +02:00
parent f6ba5cfaf4 096fa16c4c
commit f8f128b347
170 changed files with 4490 additions and 2218 deletions
@@ -286,8 +286,7 @@ definePageMetadata(computed(() => {
 	let title = i18n.ts._pages.newPage;
 	if (props.initPageId) {
 		title = i18n.ts._pages.editPage;
-	}
-	else if (props.initPageName && props.initUser) {
+	} else if (props.initPageName && props.initUser) {
 		title = i18n.ts._pages.readPage;
 	}
 	return {