watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 20:57:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge remote-tracking branch 'origin/dev' into dev

Browse source 
# Conflicts:
#	src/app/(main)/websites/[id]/reports/WebsiteReports.js
This commit is contained in:
Mike Cao 2023-10-14 22:00:36 -07:00
commit 096484ebe4
9 changed files with 97 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/(main)/settings/users/UserWebsites.js
View file

@ -22,7 +22,7 @@ export function UserWebsites({ userId }) {
<Page loading={isLoading} error={error}>
{hasData && (
<WebsitesTable
data={data}
data={data.data}
onFilterChange={handleFilterChange}
onPageChange={handlePageChange}
onPageSizeChange={handlePageSizeChange}