rallytime 786076ac03 Merge branch '2017.7' into '2018.3' ... Conflicts: - pkg/windows/modules/get-settings.psm1 - salt/modules/cmdmod.py - salt/modules/pip.py - salt/modules/win_lgpo.py - salt/states/pip_state.py - tests/integration/states/test_pip.py - tests/support/helpers.py - tests/unit/modules/test_pip.py - tests/whitelist.txt		2018-05-07 13:17:01 -04:00
..
download-module.psm1	Option to compile the Salt-Minion installer offline	2017-01-27 22:52:21 +01:00
get-settings.psm1	Merge branch '2017.7' into '2018.3'	2018-05-07 13:17:01 -04:00
start-process-and-test-exitcode.psm1	Add python 3 installer for Windows	2017-03-10 21:52:38 +00:00
uac-module.psm1	Move build files to salt/pkg/windows	2016-02-12 21:00:30 -07:00
zip-module.psm1	Move build files to salt/pkg/windows	2016-02-12 21:00:30 -07:00