rallytime 6aa8f03a4a Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/states/blockdev.py - tests/unit/states/test_blockdev.py		2017-10-18 09:31:39 -04:00
..
CODEOWNERS	Add CODEOWNERS file	2017-08-31 09:28:47 -04:00
CONTRIBUTING.md	Change .rst syntax to .md syntax	2017-03-13 17:14:50 -06:00
ISSUE_TEMPLATE.md	Tweak the pull request and issue templates	2016-03-22 11:32:07 -06:00
PULL_REQUEST_TEMPLATE.md	Typo fix	2017-10-16 13:00:11 -06:00