Skip to content
Commit 6326c2bd authored by Sylvain Renault's avatar Sylvain Renault
Browse files

Merge branch 'main' into 'develop' 

# Conflicts:
#   UserSettings/Layouts/default-2021.dwlt
parents e1b82702 2af11497
Expand all 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