Jack Kuan cf7f7faba9 Merge branch 'develop' of github.com:saltstack/salt into develop ... Conflicts: salt/renderers/jinja.py salt/renderers/json.py salt/renderers/mako.py salt/renderers/wempy.py		2012-11-15 01:29:34 -05:00
..
_ext	Added initial Sphinx documentation	2011-05-27 06:27:42 +08:00
_static	Updated logo png with transparency	2012-02-08 12:59:20 -07:00
_templates	Added Disqus commenting to documentation pages	2012-08-26 10:44:46 -07:00
man	another minor typo correction	2012-10-25 12:26:52 -05:00
ref	Merge branch 'develop' of github.com:saltstack/salt into develop	2012-11-15 01:29:34 -05:00
topics	Initial commit of 0.10.5 release notes	2012-11-14 17:25:34 -07:00
conf.py	Mocked rabbitmq_server	2012-10-25 14:36:02 -06:00
contents.rst	Added a documentation reference section on Salt internals	2012-11-06 08:56:37 -07:00
gen_gource	Add script to gen the gource video to webm	2012-01-08 00:20:18 -07:00
index.rst	Add link to cron tutorial	2012-11-09 12:26:01 -07:00
Makefile	Added initial Sphinx documentation	2011-05-27 06:27:42 +08:00