diff options
author | Florian Pritz <bluewind@xinu.at> | 2018-03-22 11:32:53 +0100 |
---|---|---|
committer | Florian Pritz <bluewind@xinu.at> | 2018-03-22 11:32:53 +0100 |
commit | 343a8b8ee33f9a181e662fc0e3a3979dd9b52dd4 (patch) | |
tree | 2be5d6faa22089f8d1b0c1d7e14f283550130370 /.mailmap | |
parent | e4803632f41cc3f09af6a88511b1d6359be3d325 (diff) | |
parent | 33414d7869aa55aaccd45cdb82268d454cb79863 (diff) | |
download | cgit-343a8b8ee33f9a181e662fc0e3a3979dd9b52dd4.tar.gz cgit-343a8b8ee33f9a181e662fc0e3a3979dd9b52dd4.tar.xz |
Merge branch 'master' of https://git.zx2c4.com/cgit into local
Diffstat (limited to '.mailmap')
-rw-r--r-- | .mailmap | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -5,6 +5,6 @@ Lars Hjemli <hjemli@gmail.com> <larsh@hal-2004.(none)> Lars Hjemli <hjemli@gmail.com> <larsh@hatman.(none)> Lars Hjemli <hjemli@gmail.com> <larsh@slackbox.hjemli.net> Lars Hjemli <hjemli@gmail.com> <larsh@slaptop.hjemli.net> -Lukas Fleischer <cgit@cryptocrack.de> <cgit@crytocrack.de> -Lukas Fleischer <cgit@cryptocrack.de> <info@cryptocrack.de> +Lukas Fleischer <lfleischer@lfos.de> <cgit@cryptocrack.de> +Lukas Fleischer <lfleischer@lfos.de> <info@cryptocrack.de> Stefan Bühler <source@stbuehler.de> <lighttpd@stbuehler.de> |