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

..

active.js

Merge branch 'dev' of https://github.com/umami-software/umami into dev

2022-10-03 17:17:53 -07:00

events.js

Merge branch 'dev' of https://github.com/umami-software/umami into dev

2022-10-03 17:17:53 -07:00

index.js

Merge branch 'dev' of https://github.com/umami-software/umami into dev

2022-10-03 17:17:53 -07:00

metrics.js

Merge branch 'dev' of https://github.com/umami-software/umami into dev

2022-10-03 17:17:53 -07:00

pageviews.js

Merge branch 'dev' of https://github.com/umami-software/umami into dev

2022-10-03 17:17:53 -07:00

reset.js

Merge branch 'dev' of https://github.com/umami-software/umami into dev

2022-10-03 17:17:53 -07:00

stats.js

Merge branch 'dev' of https://github.com/umami-software/umami into dev

2022-10-03 17:17:53 -07:00