Mike Cao f3879c92e1 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
2022-12-31 13:54:44 -08:00
..
2022-12-28 15:43:22 -08:00
2020-08-05 23:03:07 -07:00
2022-12-27 20:20:44 -08:00
2022-12-28 15:43:22 -08:00