Commit 4ead834d authored by Adam Parák's avatar Adam Parák 💬
Browse files

Merge branch '172-clientsettings' into 'decouple-loading' 

# Conflicts:
#   frontend/src/main.tsx
parents 82ca479e f2856214
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment