Merge branch 'dev' into jajaja
# Conflicts: # pnpm-lock.yaml # postcss.config.js # src/app/(main)/websites/[websiteId]/sessions/SessionsDataTable.tsx # src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx
This commit is contained in:
commit
c0ccffeab4
21 files changed
+382
-1281
No files matched your search
@@ -132,6 +132,7 @@ export const labels = defineMessages({
|
||||
all: { id: 'label.all', defaultMessage: 'All' },
|
||||
session: { id: 'label.session', defaultMessage: 'Session' },
|
||||
sessions: { id: 'label.sessions', defaultMessage: 'Sessions' },
|
||||
distinctId: { id: 'label.distinct-id', defaultMessage: 'Distinct ID' },
|
||||
pageNotFound: { id: 'message.page-not-found', defaultMessage: 'Page not found' },
|
||||
activity: { id: 'label.activity', defaultMessage: 'Activity' },
|
||||
dismiss: { id: 'label.dismiss', defaultMessage: 'Dismiss' },
|
||||
|
||||
Reference in new issue
Block a user