rallytime 0eab957281 Merge branch '2018.3' into 'develop' ... Conflicts: - salt/netapi/rest_tornado/saltnado.py - tests/integration/states/test_file.py - tests/integration/states/test_git.py - tests/unit/modules/test_tls.py		2018-04-20 15:40:49 -04:00
..
base	Merge branch '2018.3' into 'develop'	2018-04-20 15:40:49 -04:00
prod	Add regression test for issue 45893	2018-02-09 11:40:22 -05:00