Commit Graph

2 Commits (2bd336d1c9d52cf01ddcaa593944361376f1dac5)

Author SHA1 Message Date
Brian Cao 2bd336d1c9 change property names 2022-10-10 10:45:05 -07:00
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