nee2c/salt: saltstack @ resolve-conflict-#54907

Erik Johnson ae96e29032 Fix docs configuration for renamed logstash engine		vor 6 Jahren
..
index.rst	ae96e29032 Fix docs configuration for renamed logstash engine	vor 6 Jahren
salt.engines.docker_events.rst	2b7f96bf0e Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron	vor 8 Jahren
salt.engines.hipchat.rst	dd21da4992 Add autodoc topics for new modules added in Carbon (#36933)	vor 8 Jahren
salt.engines.http_logstash.rst	2320865e5c Remove references to logstash_http engine: should be http_logstash.	vor 8 Jahren
salt.engines.ircbot.rst	4d9722fb45 Add ircbot engine for sending events to the reactor	vor 8 Jahren
salt.engines.junos_syslog.rst	d398c5f7ee Update autodoc topics for new modules added in develop	vor 7 Jahren
salt.engines.logentries.rst	bdda03c456 Add logentries engine	vor 9 Jahren
salt.engines.logstash_engine.rst	ae96e29032 Fix docs configuration for renamed logstash engine	vor 6 Jahren
salt.engines.napalm_syslog.rst	93ee5ee2b0 Fix all Sphinx warnings	vor 6 Jahren
salt.engines.reactor.rst	e48b84c98f Fixed build errors, additional mock imports, new module docs	vor 8 Jahren
salt.engines.redis_sentinel.rst	2b7f96bf0e Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron	vor 8 Jahren
salt.engines.slack.rst	2b7f96bf0e Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron	vor 8 Jahren
salt.engines.sqs_events.rst	39f31b1ab0 Adding salt.engines.sqs_events.rst to doc	vor 9 Jahren
salt.engines.stalekey.rst	d398c5f7ee Update autodoc topics for new modules added in develop	vor 7 Jahren
salt.engines.test.rst	b001cb6534 Added engine modules to modules index in docs	vor 9 Jahren
salt.engines.thorium.rst	fd7f7bcddf Updated release notes	vor 8 Jahren
salt.engines.webhook.rst	daf474a6eb add webhook engine	vor 8 Jahren