Colton Myers 1e1f5f3a95 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: doc/conf.py doc/topics/cloud/config.rst doc/topics/cloud/index.rst salt/modules/git.py salt/states/git.py salt/states/pkgrepo.py		2015-09-01 15:35:21 -06:00
..
external_cache.rst	Fixed typos	2015-07-08 21:12:24 -06:00
index.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
job_cache.rst	Additional docs on external and master job cache, assorted doc fixes	2015-07-08 20:33:34 -06:00
schedule.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-09-01 15:35:21 -06:00