Skip to content
Snippets Groups Projects
Commit ad71d2fc authored by Nikolai Mork's avatar Nikolai Mork
Browse files

Merge branch 'master' into 'module-phonebook' 

# Conflicts:
#   soitool/new_module_dialog.py
#   soitool/serialize_export_import_soi.py
parents 3bdb01e3 2960cecd
No related branches found
No related tags found
Pipeline #83651 failed
Stage: lint
Stage: test
Stage: deploy
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1459 additions and 268 deletions
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