rallytime fe7ff0ebfa Merge branch '2015.8' into '2016.3' ... Conflicts: - salt/cloud/__init__.py - salt/returners/smtp_return.py		2016-03-10 13:13:35 -07:00
..
cloud-settings-inheritance.png	Made udpates as suggested by @rallytime	2016-03-09 11:00:27 -07:00
external-job-cache.png	Additional docs on external and master job cache, assorted doc fixes	2015-07-08 20:33:34 -06:00
favicon.ico	Updated favicon with new logo	2014-03-25 09:36:33 -06:00
master-job-cache.png	Additional docs on external and master job cache, assorted doc fixes	2015-07-08 20:33:34 -06:00
proxy_minions.drawio.xml	Fix typo in some draw object labels	2015-08-28 12:49:16 -06:00
proxy_minions.png	Fix typo in some draw object labels	2015-08-28 12:49:16 -06:00
proxy_minions.svg	Fix typo in some draw object labels	2015-08-28 12:49:16 -06:00
rest_status_screen.png	Add end-to-end walkthrough	2015-08-18 14:43:26 -06:00
salt-logo-full.svg	Added vector versions of the latest Salt logo	2014-03-21 13:51:53 -06:00
salt-logo.pdf	Added vector versions of the latest Salt logo	2014-03-21 13:51:53 -06:00
salt-logo.png	saltstack2 sphinx theme and build settings	2015-05-11 17:29:12 -06:00
salt-logo.svg	Added vector versions of the latest Salt logo	2014-03-21 13:51:53 -06:00
spm-overview.png	updated spm docs	2015-12-28 14:29:02 -07:00
spm-package-contents.png	updated spm docs	2015-12-28 14:29:02 -07:00
spm-package-extraction.png	updated spm docs	2015-12-28 14:29:02 -07:00