diff options
| author | Werner Koch <[email protected]> | 2023-12-22 12:45:02 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2023-12-22 12:45:02 +0000 |
| commit | 2764ee309a2e0c10cef606345f06dd37c637fc41 (patch) | |
| tree | 4238a756e7624b31ade6e558a1c0794af691412d /AUTHORS | |
| parent | Register DCO for Mario Haustein (diff) | |
| parent | doc: Explain why socket activation is a problem (diff) | |
| download | gnupg-2764ee309a2e0c10cef606345f06dd37c637fc41.tar.gz gnupg-2764ee309a2e0c10cef606345f06dd37c637fc41.zip | |
Merge branch 'STABLE-BRANCH-2-4'
--
Fixed conflicts in
NEWS
g10/encrypt.c
sm/encrypt.c
sm/sign.c
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -221,7 +221,7 @@ Kyle Butt <[email protected]> 2013-05-29:CAAODAYLbCtqOG6msLLL0UTdASKWT6u2ptxsgUQ1JpusBESBoNQ@mail.gmail.com: Mario Haustein <[email protected]> -2022-09026:8149069.T7Z3S40VBb@localdomain: +2022-09-26:8149069.T7Z3S40VBb@localdomain: Michael Haubenwallner <[email protected]> 2018-07-13:[email protected]: |