Merge remote-tracking branch 'upstream/master' into GPII-4135

# Conflicts: # gpii/node_modules/WindowsUtilities/WindowsUtilities.js
GPII · Nov 6, 2019 · bfeb330 · bfeb330
2 parents 36977da + 5eb99a4
commit bfeb330
Show file tree

Hide file tree

Showing 4 changed files with 441 additions and 58 deletions.
diff --git a/gpii/node_modules/WindowsUtilities/WindowsUtilities.js b/gpii/node_modules/WindowsUtilities/WindowsUtilities.js
diff --git a/gpii/node_modules/nativeSettingsHandler/src/nativeSettingsHandler.js b/gpii/node_modules/nativeSettingsHandler/src/nativeSettingsHandler.js