salt/doc/topics/windows
Colton Myers f4cb659a2a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/topics/windows/windows-package-manager.rst
    salt/modules/event.py
    salt/returners/carbon_return.py
    salt/state.py
    salt/states/pkg.py
2015-08-03 14:50:50 -06:00
..
index.rst Whitespace cleanup 2014-12-11 07:53:19 -08:00
windows-package-manager.rst Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-08-03 14:50:50 -06:00
windows-specific-behavior.rst Whitespace cleanup 2014-12-11 07:53:19 -08:00