rallytime 7dc1e770c4 Merge branch '2018.3' into 'develop' ... Conflicts: - doc/topics/installation/freebsd.rst - salt/cloud/clouds/oneandone.py - salt/grains/core.py - salt/modules/napalm_ntp.py - salt/modules/win_update.py - salt/modules/win_wua.py - salt/modules/zabbix.py - salt/renderers/pass.py - salt/states/vault.py - tests/unit/states/test_win_update.py		2018-06-06 13:35:36 -04:00
..
config.rst	Update correct default value for spm_build_dir	2016-06-27 13:11:23 +02:00
dev.rst	Update all references for moved functions to use "files" util	2017-07-18 10:31:01 -06: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