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

..

common

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

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

forms

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

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

helpers

Added website limit and show more button. Closes #592.

2022-03-01 23:03:50 -08:00

layout

Merge pull request #1465 from aidanm1999/feature/2022-09/admin-website-assigning

2022-09-03 23:17:06 -07:00

metrics

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

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

pages

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

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

settings

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

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

messages.js

Updated messages.

2022-02-22 13:31:37 -08:00