watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-15 01:55:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'dev' into jajaja

Browse source 
# Conflicts:
#	next.config.ts
#	src/app/(main)/settings/preferences/LanguageSetting.tsx
#	src/components/hooks/useConfig.ts
This commit is contained in:
Mike Cao 2025-07-27 02:11:32 -07:00
commit b552868e0a
14 changed files with 55 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/app/layout.tsx
View file

@ -9,6 +9,14 @@ import '@/styles/global.css';
import '@/styles/variables.css';
export default function ({ children }) {
if (process.env.DISABLE_UI) {
return (
<html>
<body></body>
</html>
);
}
return (
<html lang="en">
<head>