diff options
author | ng0 <ng0@n0.is> | 2019-12-08 11:00:28 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-12-08 11:00:28 +0000 |
commit | 9975d6f250dee9a4d599d2c144b3700646290ca3 (patch) | |
tree | d64aac0ce4e15c370319c05d636d07fca8d8a312 /.mailmap | |
parent | eda66aa43040d9196b61a1a7e0bad7e7c5dee693 (diff) | |
parent | 2b9a55a928876e5d3ae3baa2908a99269880383a (diff) | |
download | www-9975d6f250dee9a4d599d2c144b3700646290ca3.tar.gz www-9975d6f250dee9a4d599d2c144b3700646290ca3.zip |
Merge branch 'master' into stable
Diffstat (limited to '.mailmap')
-rw-r--r-- | .mailmap | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap new file mode 100644 index 00000000..017cc9a6 --- /dev/null +++ b/.mailmap | |||
@@ -0,0 +1,2 @@ | |||
1 | ng0 <ng0@n0.is> | ||
2 | ng0 <ng0@n0.is> Nils Gillmann <gillmann@infotropique.org> | ||