rallytime 239f3511bf Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/modules/reg.py - salt/modules/state.py - salt/modules/win_pkg.py - salt/netapi/rest_cherrypy/app.py - salt/utils/__init__.py - tests/integration/modules/test_file.py - tests/integration/output/test_output.py - tests/unit/grains/test_core.py		2017-12-01 11:12:44 -05:00
..
index.rst	Merge branch '2016.11' into '2017.7'	2017-12-01 11:12:44 -05:00