Merge remote-tracking branch 'origin/main' into develop

Browse Source

# Conflicts:
#	CHANGELOG.md
#	messages/de.json
#	messages/en.json
#	messages/es.json
#	messages/fr.json
#	messages/it.json
#	messages/pl.json
#	next.config.ts
#	package.json
#	src/app/api/analytics/__tests__/route.test.ts
#	src/app/api/analytics/route.ts
#	src/app/page.tsx
#	src/components/charts/compliance-heatmap.tsx
#	src/components/charts/trend-card.tsx
#	src/components/insights/insights-tab-strip.tsx
#	src/components/settings/__tests__/settings-shell.test.tsx
#	src/components/settings/settings-shell.tsx
#	src/lib/analytics/__tests__/summaries-slice.test.ts
#	src/lib/analytics/summaries-slice.ts
#	src/lib/insights/sub-page-metric.ts
#	src/lib/queries/use-analytics-query.ts

...

This commit is contained in:

Marc-André Bombeck committed 2026-05-16 21:20:11 +02:00

2 parents 1ae4adfd64 7bef199039

commit fd1a4366bb

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available