Skip to content
Commit e9b113ab authored by Jakub Uhlárik's avatar Jakub Uhlárik
Browse files

Merge branch 'master' into 'api-frotend' 

# Conflicts:
#   frontend/src/components/PresetView.tsx
#   frontend/src/themes/muiTheme.ts
#   frontend/src/types/Configuration.ts
parents 00bb441b 3a0c19f8
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment