rallytime 5b50eaf6b0 Merge branch '2018.3' into 'develop' ... Conflicts: - doc/ref/proxy/all/salt.proxy.cimc.rst - doc/ref/proxy/all/salt.proxy.panos.rst - doc/topics/releases/2018.3.0.rst - salt/modules/cmdmod.py - salt/modules/state.py - salt/utils/schedule.py - tests/integration/modules/test_state.py		2018-04-05 13:25:46 -04:00
..
index.rst	Merge branch '2018.3' into 'develop'	2018-04-05 13:25:46 -04:00