Erik Johnson f13ddeb394 Merge remote-tracking branch 'upstream/2016.11' into merge-2017.7 ... Conflicts: - doc/_themes/saltstack2/layout.html - salt/auth/__init__.py - salt/utils/schedule.py		2017-06-28 20:27:32 -05:00
..
saltstack	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
saltstack2	Merge remote-tracking branch 'upstream/2016.11' into merge-2017.7	2017-06-28 20:27:32 -05:00