Ch3LL 63962b547a Merge branch '2018.3' into '2019.2' ... Conflicts: - salt/states/linux_acl.py - salt/transport/ipc.py		2019-03-28 11:10:45 -04:00
..
events.rst	Merge branch '2018.3' into 'develop'	2018-07-09 10:40:23 -04:00
index.rst	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
master_events.rst	Replaced test.ping with test.version	2019-03-25 12:09:48 -05:00