watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-09 07:07:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'dev' of https://github.com/umami-software/umami into dev

Browse source 
# Conflicts:
#	components/forms/UserPasswordForm.js
#	components/pages/Dashboard.js
This commit is contained in:
Mike Cao 2022-12-28 15:49:28 -08:00
commit db6a6d6055
7 changed files with 59 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/settings/ProfileDetails.js
View file

@ -4,7 +4,7 @@ import useUser from 'hooks/useUser';
import { FormattedMessage } from 'react-intl';
import DateRangeSetting from './DateRangeSetting';
import LanguageSetting from './LanguageSetting';
import styles from './ProfileSettings.module.css';
import styles from './ProfileDetails.module.css';
import ThemeSetting from './ThemeSetting';
export default function ProfileDetails() {

0
components/settings/ProfileSettings.module.css → components/settings/ProfileDetails.module.css
View file