rallytime 8e4b679d5c Merge branch '2016.11' into 'nitrogen' ... Conflicts: - salt/modules/pip.py		2017-05-01 10:45:19 -06:00
..
index.rst	Change OSX/OS X to macOS where possible	2016-12-28 14:49:46 -07:00
master.rst	Merge branch '2016.11' into 'develop'	2016-12-20 10:03:44 -07:00
minion.rst	Merge branch '2016.3' into '2016.11'	2016-12-19 14:58:39 -07:00
yaml_idiosyncrasies.rst	Add additional note about quoting within load_yaml	2017-04-27 11:13:01 -05:00