Learn more about cloning repositories
You have read-only access
Merge branch 'master' into refactor Conflicts: installerbuilder/installerbase/installerbase.cpp