Skip to content

Commit 009a339

Browse files
committed
Merge remote-tracking branch 'origin/master' into news-expiration-date-8485
2 parents 810fb6e + 0c4e1a3 commit 009a339

File tree

7 files changed

+846
-700
lines changed

7 files changed

+846
-700
lines changed

src/packages/next/lib/with-customize.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export default async function withCustomize(
6767
customize.onCoCalcCom = customize.kucalc === KUCALC_COCALC_COM;
6868
customize.noindex = obj.props?.unlisted ?? false;
6969
customize.imprintOrPolicies =
70-
(customize.imprint ?? "" + customize.policies ?? "") != "";
70+
(customize.imprint ?? "") + (customize.policies ?? "") != "";
7171
customize.serverTime = Date.now();
7272

7373
// this is used for creating new projects from a share

src/packages/next/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
"@types/node": "^18.16.14",
103103
"@types/react": "^19.1.10",
104104
"@uiw/react-textarea-code-editor": "^3.1.1",
105-
"next-rspack": "^15.3.4",
105+
"next-rspack": "^15.4.6",
106106
"node-mocks-http": "^1.14.1"
107107
}
108108
}

src/packages/next/pages/about/events.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ const BODY_STYLE: CSS = {
3030
maxHeight: "max(300px, 75vh)",
3131
overflowY: "auto",
3232
} as const;
33+
3334
interface TitleComponentProps {
3435
newsItem: NewsWithStatus;
3536
showHelpTicket?: boolean;

0 commit comments

Comments
 (0)