rallytime da646cb44f Merge branch '2018.3' into 'develop' ... Conflicts: - doc/topics/event/events.rst - tests/integration/states/test_file.py - tests/unit/states/test_file.py		2018-07-09 10:40:23 -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	Adding in documention for auth_events configuration option	2018-01-05 12:29:21 -08:00