Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into features/issue_32_h…
…arman_sdk # Resolved Conflicts: # InstallerSharedCore/src/actionScripts/interfaces/IHelperMoonshineBridge.as # InstallerSharedCore/src/actionScripts/managers/DetectionManager.as # InstallerSharedCore/src/actionScripts/utils/HelperUtils.as # InstallerSharedCore/src/actionScripts/valueObjects/ComponentTypes.as # InstallerSharedCore/src/components/renderers/ComponentRenderer.mxml # InstallerSharedCore/src/helperResources/data/moonshineHelperConfig.xml (#32)
- Loading branch information