Mike Cao 8627782137 Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # components/settings/WebsiteSettings.js # pages/api/websites/[id]/index.js		2022-10-11 21:51:47 -07:00
..
common	Merge branch 'dev' of https://github.com/umami-software/umami into dev	2022-10-03 17:17:53 -07:00
forms	Feat/um 62 prisma property names (#1562)	2022-10-10 13:42:18 -07:00
helpers	Added website limit and show more button. Closes #592.	2022-03-01 23:03:50 -08:00
layout	Feat/um 62 prisma property names (#1562)	2022-10-10 13:42:18 -07:00
metrics	Refactor auth logic.	2022-10-11 21:48:33 -07:00
pages	Merge remote-tracking branch 'origin/dev' into dev	2022-10-11 21:51:47 -07:00
settings	fix reset/delete	2022-10-11 19:43:02 -07:00
messages.js	Updated messages.	2022-02-22 13:31:37 -08:00