rallytime 3f74d697b9 Merge branch '2016.11' into 'develop' ... Conflicts: - pkg/windows/build_pkg.bat - salt/modules/archive.py		2017-01-20 12:07:19 -07:00
..
index.rst	Merge branch '2016.11' into 'develop'	2017-01-20 12:07:19 -07:00
integration.rst	Change OSX/OS X to macOS where possible	2016-12-28 14:49:46 -07:00
unit.rst	Add some "best practices" information to test documentation	2016-03-28 14:23:42 -06:00