diff options
| author | Werner Koch <[email protected]> | 2018-04-10 08:14:30 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2018-04-10 08:14:30 +0000 |
| commit | 36373798c0955241288fb4aec103830106dd7e1f (patch) | |
| tree | fe0ed178d1aeda3847c9c8133a2ed8488a84644a /dirmngr/dirmngr_ldap.c | |
| parent | Merge branch 'STABLE-BRANCH-2-2' into master (diff) | |
| parent | agent: Improve the unknown ssh flag detection. (diff) | |
| download | gnupg-36373798c0955241288fb4aec103830106dd7e1f.tar.gz gnupg-36373798c0955241288fb4aec103830106dd7e1f.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
--
Fixed conflicts:
NEWS - keep master
configure.ac - merge
g10/card-util.c - mostly 2.2
g10/sig-check.c - 2.2
Diffstat (limited to 'dirmngr/dirmngr_ldap.c')
0 files changed, 0 insertions, 0 deletions