rallytime 2cfabc467c Merge branch '2016.11' into '2017.7' ... Conflicts: - pkg/windows/req.txt - salt/modules/dockermod.py		2017-06-19 14:17:01 -06:00
..
_ext	Adding Jinja cross ref	2017-06-19 09:49:45 +00:00
_incl	Remove ":doc:" references from a bunch of doc/* files	2016-12-15 16:09:27 -07:00
_static	Add ability to clone from a snapshot to salt-cloud vmware driver	2016-09-12 14:49:20 -04:00
_templates
_themes	Add "Edit on GitHub" link to the docs	2017-03-01 00:34:22 -05:00
.scripts
.tx	Remove deprecated vsphere cloud driver in Carbon release	2016-08-05 16:16:12 -06:00
cheatsheet
man	Fix comments about the "hash_type" option	2017-05-09 11:10:29 -06:00
ref	Merge branch '2016.11' into '2017.7'	2017-06-19 14:17:01 -06:00
security
topics	Remove duplicate mattermost ref	2017-06-19 09:52:54 +00:00
apidoc-saltmods.sh
conf.py	Merge branch '2016.11' into 'nitrogen'	2017-05-24 16:32:59 -06:00
contents.rst	add venafi to table of contents	2017-05-25 10:27:40 -06:00
faq.rst	Merge branch '2016.11' into 'nitrogen'	2017-05-24 16:32:59 -06:00
gen_gource
glossary.rst	Merge branch '2016.11' into 'develop'	2017-02-09 10:29:40 -07:00
Makefile	Do not require sphinx-build for cleaning docs	2017-05-23 17:14:11 +02:00
spelling_wordlist.txt	Remove dockerio state/module (moved to salt-contrib)	2017-02-18 21:58:24 -06:00