Gareth J. Greenaway 9c04986641 Merge branch '2018.3' into merge-fluorine ... Conflicts: doc/conf.py doc/topics/development/dunder_dictionaries.rst salt/client/ssh/ssh_py_shim.py salt/grains/core.py salt/modules/mysql.py salt/modules/state.py		2018-12-20 17:20:42 -08:00
..
config.rst	Update correct default value for spm_build_dir	2016-06-27 13:11:23 +02:00
dev.rst	Merge branch '2017.7' into '2018.3'	2018-12-14 11:15:48 -05:00
index.rst	updated spm docs	2015-12-28 14:29:02 -07:00
master.rst	Fix all Sphinx warnings	2018-05-31 15:28:25 -05:00
packaging.rst	updated spm docs	2015-12-28 14:29:02 -07:00
repo.rst	updated spm docs	2015-12-28 14:29:02 -07:00
spm_formula.rst	Merge branch '2018.3' into 'develop'	2018-06-06 13:35:36 -04:00