rallytime eaca3291e2 Merge branch '2016.11' into '2017.7' ... Conflicts: - tests/unit/modules/test_state.py		2017-10-05 12:09:40 -04:00
..
static	Merge branch '2016.11' into '2017.7'	2017-10-05 12:09:40 -04:00
layout.html	Merge remote-tracking branch 'upstream/2016.11' into merge-2017.7	2017-06-28 20:27:32 -05:00
theme.conf	sphinx saltstack2 doc theme	2015-05-19 13:36:57 -06:00