aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2021-01-22 10:43:32 +0100
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2021-01-22 13:06:35 +0100
commit0bc9e3ca155a2be017039dde143fa590efba0c58 (patch)
treebac26724fccf751856f10a2309889b70cbff6bb1 /.mailmap
parentd47b84be67242960f6af5e8d16ea140e62a0933b (diff)
downloadnextcloud-server-0bc9e3ca155a2be017039dde143fa590efba0c58.tar.gz
nextcloud-server-0bc9e3ca155a2be017039dde143fa590efba0c58.zip
Change license mail alias
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index e0203ba1ebc..e4d268a28f0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -358,7 +358,8 @@ Simon Birnbach <simon@simon-birnbach.de>
Simon Könnecke <simonkoennecke@gmail.com>
Simon Whittaker <simon@swbh.net>
Sjors van der Pluijm <sjors@desjors.nl> Sjors van der Pluijm <sjors@youngguns.nl>
-John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> John Molakvoæ <skjnldsv@users.noreply.github.com>
+John Molakvoæ <skjnldsv@protonmail.com> John Molakvoæ <skjnldsv@users.noreply.github.com>
+John Molakvoæ <skjnldsv@protonmail.com> John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
st3so <st3so@server.fake>
Stefan <mu.stefan@googlemail.com>
Stefan Göckeritz <admin@s-goecker.de>