rallytime 0b96d52f71 Merge branch '2016.11' into 'nitrogen' ... Conflicts: - salt/modules/win_pkg.py		2017-04-20 11:21:10 -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	Merge branch '2016.11' into 'nitrogen'	2017-04-20 11:21:10 -06:00
windows-specific-behavior.rst	Make win_file use the win_dacl salt util	2017-03-01 17:57:23 -07:00