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
parent 5fb1f08df8 d6854d4ff9
commit d784b2a8db
31 changed files with 178 additions and 149 deletions
--- a/components/settings/WebsiteSettings.js
+++ b/components/settings/WebsiteSettings.js
@@ -86,8 +86,8 @@ export default function WebsiteSettings() {
  const DetailsLink = ({ website_id, name, domain }) => (
    <Link
      className={styles.detailLink}
-      href="/website/[...id]"
-      as={`/website/${website_id}/${name}`}
+      href="/websites/[...id]"
+      as={`/websites/${website_id}/${name}`}
    >
      <Favicon domain={domain} />
      <OverflowText tooltipId={`${website_id}-name`}>{name}</OverflowText>