rallytime eaca3291e2 Merge branch '2016.11' into '2017.7' ... Conflicts: - tests/unit/modules/test_state.py		2017-10-05 12:09:40 -04:00
..
saltstack	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
saltstack2	Merge branch '2016.11' into '2017.7'	2017-10-05 12:09:40 -04:00