rallytime 5b50eaf6b0 Merge branch '2018.3' into 'develop' ... Conflicts: - doc/ref/proxy/all/salt.proxy.cimc.rst - doc/ref/proxy/all/salt.proxy.panos.rst - doc/topics/releases/2018.3.0.rst - salt/modules/cmdmod.py - salt/modules/state.py - salt/utils/schedule.py - tests/integration/modules/test_state.py		2018-04-05 13:25:46 -04: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 NAPALM logo	2017-05-04 09:09:08 +00:00
_templates
_themes	Merge branch '2016.11' into '2017.7'	2018-02-28 14:59:01 -05:00
.scripts
.tx	Remove deprecated vsphere cloud driver in Carbon release	2016-08-05 16:16:12 -06:00
cheatsheet
man	Merge branch '2018.3' into 'develop'	2018-04-05 13:25:46 -04:00
ref	Merge branch '2018.3' into 'develop'	2018-04-05 13:25:46 -04:00
security
topics	Merge branch '2018.3' into 'develop'	2018-04-05 13:25:46 -04:00
apidoc-saltmods.sh	New doc site layout, 2016.3.0 release note known issue additions	2016-05-25 17:39:55 -06:00
conf.py	Merge pull request #46741 from rallytime/develop_update_version_doc	2018-04-03 10:25:37 -04:00
contents.rst	Slots documentation.	2018-01-11 14:05:58 +03:00
faq.rst	Merge branch '2017.7' into '2018.3'	2018-03-27 16:31:55 -04:00
gen_gource
glossary.rst	Touch up glossary references	2018-03-13 17:28:54 -05:00
Makefile	Do not require sphinx-build for cleaning docs	2017-05-23 17:14:11 +02:00
spelling_wordlist.txt	remove Stormpath module, states and docs	2017-08-14 16:03:00 -06:00