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
1 merge request!57#96 Telefonliste & Fiks til høyde på tabeller (rundt oppløsning)
Pipeline #83651 failed
Stage: lint
Stage: test
Stage: deploy