rallytime 27988dde48 Merge branch '2015.8' into '2016.3' ... Conflicts: - doc/ref/configuration/minion.rst		2016-07-07 12:31:12 -06:00
..
logging	Merge branch '2015.8' into '2016.3'	2016-06-28 14:26:24 -06:00
examples.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
index.rst	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
master.rst	Merge branch '2015.8' into '2106.3'	2016-05-25 13:44:21 -06:00
minion.rst	Merge branch '2015.8' into '2016.3'	2016-07-07 12:31:12 -06:00
nonroot.rst	Comma cleanup	2014-12-12 11:34:34 -08:00