rallytime 760f479424 Merge branch '2015.8' into '2016.3' ... Conflicts: - salt/cli/daemons.py - salt/config/__init__.py - salt/scripts.py - salt/state.py - tests/unit/config/config_test.py		2016-04-05 15:09:27 -06:00
..
index.rst	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
windows-package-manager.rst	Add documentation for disabled the winrepos	2016-04-01 14:18:31 -06:00
windows-specific-behavior.rst	Doc-fix: Escape backslash in domain\username	2015-08-21 09:44:20 -06:00