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
..
files/test	Better trace for nested jinja errors	2014-01-03 18:16:11 +01:00
__init__.py	Include the python encoding file header on tests.	2013-11-27 11:19:24 +00:00
test_jinja.py	Merge branch '2017.7' into 'oxygen'	2018-01-23 13:26:43 -05:00