rallytime 031a75ca33 Merge branch '2015.8' into '2016.3' ... Conflicts: - Contributing.rst - conf/master - doc/index.rst - doc/man/salt.7 - pkg/suse/README.suse - salt/client/ssh/state.py - salt/minion.py - salt/modules/zypper.py - salt/utils/schedule.py - tests/unit/modules/zypper_test.py		2016-03-02 10:26:13 -07:00
..
static	Merge branch '2015.8' into '2016.3'	2016-03-02 10:26:13 -07:00
layout.html	Release notes updated	2016-02-16 19:54:49 -07:00
theme.conf	sphinx saltstack2 doc theme	2015-05-19 13:36:57 -06:00