merge
authorKrista Grothoff <krista@pep-project.org>
Tue, 07 Feb 2017 04:25:55 +0100
changeset 1570d03c8137e926
parent 1568 4af26e1915f1
parent 1569 01285fc24d20
child 1571 e22a159b12e3
child 1576 e7b04608f770
merge
     1.1 --- a/src/pgp_gpg.c	Mon Feb 06 21:07:12 2017 +0100
     1.2 +++ b/src/pgp_gpg.c	Tue Feb 07 04:25:55 2017 +0100
     1.3 @@ -118,6 +118,9 @@
     1.4          stringlist_add(conf_keys, "personal-digest-preferences");
     1.5          stringlist_add(conf_values, "SHA256 SHA512 SHA384 SHA224");
     1.6  
     1.7 +        stringlist_add(conf_keys, "ignore-time-conflict");
     1.8 +        stringlist_add(conf_values, "");
     1.9 +
    1.10          bResult = ensure_config_values(conf_keys, conf_values, gpg_conf());
    1.11  
    1.12          free_stringlist(conf_keys);