rallytime 052b13c98e Merge branch '2017.7' into 'develop' ... Conflicts: - salt/cli/daemons.py - salt/client/ssh/__init__.py - salt/modules/win_pkg.py - salt/netapi/rest_cherrypy/app.py - salt/proxy/fx2.py - salt/utils/__init__.py - salt/utils/jinja.py - salt/utils/napalm.py - salt/utils/path.py - salt/utils/verify.py - tests/integration/modules/test_saltutil.py - tests/integration/states/test_service.py - tests/unit/utils/test_verify.py		2017-11-22 12:36:03 -05:00
..
all	Added new Telegram module	2017-11-20 08:47:57 +01:00
index.rst	Merge branch '2017.7' into 'develop'	2017-11-22 12:36:03 -05:00