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	Refactored dashboard sort logic.	2022-08-04 21:37:18 -07:00
DashboardSettingsButton.module.css	Move reordering of websites onto dashboard	2022-07-24 23:25:04 -07:00
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	Use next-basics package.	2022-08-28 20:20:54 -07:00
UserButton.module.css
WebsiteSettings.js	Merge branch 'dev' of https://github.com/umami-software/umami into dev	2022-10-03 17:17:53 -07:00
WebsiteSettings.module.css	Restore table component and website settings page	2022-07-24 23:07:56 -07:00