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
..
base	Merge branch '2017.7' into '2018.3'	2018-05-07 13:17:01 -04:00
prod	Add regression test for issue 45893	2018-02-09 11:40:22 -05:00