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/metrics/MetricsTable.js
+++ b/components/metrics/MetricsTable.js
@@ -38,7 +38,7 @@ export default function MetricsTable({
  const { formatMessage } = useIntl();

  const { data, loading, error } = useFetch(
-    `/website/${websiteId}/metrics`,
+    `/websites/${websiteId}/metrics`,
    {
      params: {
        type,