Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feature/708-customizable-styles'…
Browse files Browse the repository at this point in the history
… into feature/708-customizable-styles

# Conflicts:
#	frontend/src/app/shared/services/chustomization.service.spec.ts
  • Loading branch information
Martin Käser committed Mar 21, 2024
2 parents 016bb2f + d998753 commit 1591027
Showing 1 changed file with 0 additions and 0 deletions.
Empty file.

0 comments on commit 1591027

Please sign in to comment.