mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 08:58:59 +00:00
786076ac03
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 |
||
---|---|---|
.. | ||
base-py2.txt | ||
base-py3.txt | ||
base.txt | ||
dev_python27.txt | ||
dev_python34.txt | ||
opt.txt | ||
pytest.txt | ||
raet.txt | ||
zeromq.txt |