Skip to content
Commit 16555dfb authored by Patrik Knižka's avatar Patrik Knižka
Browse files

Merge branch 'devel' into 'gui-010'

# Conflicts:
#   track_your_time_monorepo/apps/web/src/pages/ModalPage/BranchModalPage.tsx
#   track_your_time_monorepo/apps/web/src/pages/ModalPage/DepartmentModalPage.tsx
#   track_your_time_monorepo/apps/web/src/pages/ModalPage/ModalPage.module.css
#   track_your_time_monorepo/apps/web/src/pages/ModalPage/ModalStyles.tsx
#   track_your_time_monorepo/apps/web/src/pages/ModalPage/PositionModalPage.tsx
parents b557707b a68d2bb0
Loading
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment