rallytime 3c298afa72 Merge branch '2017.7' into 'oxygen' ... Conflicts: - salt/modules/pip.py - salt/modules/reg.py - salt/modules/win_pkg.py - salt/runners/manage.py - salt/states/pkg.py - salt/transport/zeromq.py - salt/utils/event.py - tests/integration/modules/test_pip.py - tests/integration/states/test_user.py - tests/unit/grains/test_core.py - tests/unit/states/test_archive.py - tests/unit/utils/test_boto.py		2018-01-23 13:26:43 -05:00
..
access_control.rst	[2016.3] Merge forward from 2015.8 to 2016.3 (#32784)	2016-04-25 15:26:09 -06:00
index.rst	Merge branch '2017.7' into 'oxygen'	2018-01-23 13:26:43 -05:00