rallytime fca4e5563a Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/modules/win_pkg.py - tests/unit/utils/test_parsers.py		2017-09-22 09:40:03 -04:00
..
all	Merge branch '2016.11' into '2017.7'	2017-09-22 09:40:03 -04:00
index.rst	Remove more ":doc:" references from doc/* files	2016-12-15 15:36:44 -07:00