mirror of
https://github.com/umami-software/umami.git
synced 2026-02-10 15:47:13 +01:00
Merge branch 'dev' of https://github.com/umami-software/umami into dev
# Conflicts: # lib/middleware.ts # pages/api/users/[id]/index.ts # pages/api/users/index.ts # pages/api/websites/[id]/active.ts # pages/api/websites/[id]/eventdata.ts # pages/api/websites/[id]/events.ts # pages/api/websites/[id]/index.ts # pages/api/websites/[id]/metrics.ts # pages/api/websites/[id]/pageviews.ts # pages/api/websites/[id]/reset.ts # pages/api/websites/[id]/stats.ts # yarn.lock
This commit is contained in:
commit
f3879c92e1
212 changed files with 2642 additions and 2841 deletions
|
|
@ -1,4 +1,3 @@
|
|||
import React from 'react';
|
||||
import { useRouter } from 'next/router';
|
||||
import Layout from 'components/layout/Layout';
|
||||
import WebsiteDetails from 'components/pages/WebsiteDetails';
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue