Merge branch 'master' into more-encompassing-number-skips

This commit is contained in:
Arfon Smith
2015-07-29 13:54:51 +01:00
parent 885b5aab41
commit 90a293727d
434 changed files with 79876 additions and 56121 deletions

View File

@@ -0,0 +1,13 @@
gpg4win-light:
2.2.3:
installer: 'http://files.gpg4win.org/gpg4win-light-2.2.3.exe'
full_name: 'Gpg4Win (2.2.3)'
reboot: False
install_flags: '/S'
uninstaller: '%ProgramFiles%\GNU\GnuPG\gpg4win-uninstall.exe'
uninstall_flags: '/S'
#
# Note: this 2.2.3 light installer has a bug and it needs to be fixed upstream
# Here are work around instructions under Issue #113 in the meantime
# https://github.com/saltstack/salt-winrepo/issues/113#issuecomment-72837987
#