Merge branch '2014.7' into '2015.5'

Browse source

Conflicts:
 - pkg/windows/installer/Salt-Minion-Setup.nsi

...

This commit is contained in:

rallytime 2016-03-17 12:30:53 -06:00

parent 2d1f2a0c2e ba73deee46

commit 1b6ec5d445

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available