Merge branch 'main' of github.com:Timetracking-Project/timetracking into feature/add_time_overview

# Conflicts:
#	docker-compose.yml
This commit is contained in:
Gregor Vostrak
2024-03-26 18:22:47 +01:00
56 changed files with 1316 additions and 128 deletions

View File

@@ -90,6 +90,7 @@ export interface User {
two_factor_recovery_codes?: string | null;
two_factor_confirmed_at: string | null;
timezone: string;
week_start: string;
// mutators
profile_photo_url: string;
// relations