Mike Cao d784b2a8db Merge branch 'dev' of https://github.com/umami-software/umami into dev ... # Conflicts: # pages/api/account/index.js		2022-10-03 17:17:53 -07:00
..
AccountSettings.js
AccountSettings.module.css
DashboardSettingsButton.js
DashboardSettingsButton.module.css
DateRangeSetting.js
DateRangeSetting.module.css
LanguageButton.js
LanguageButton.module.css
LanguageSetting.js
ProfileSettings.js
ProfileSettings.module.css
ThemeButton.js
ThemeButton.module.css
ThemeSetting.js
ThemeSetting.module.css
TimezoneSetting.js
TimezoneSetting.module.css
UserButton.js
UserButton.module.css
WebsiteSettings.js
WebsiteSettings.module.css