rallytime 494a06bee2 Merge branch '2016.11' into 'develop' ... Conflicts: - doc/ref/configuration/minion.rst		2016-12-20 10:03:44 -07:00
..
index.rst	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
syndic.rst	Merge branch '2016.11' into 'develop'	2016-12-20 10:03:44 -07:00