aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2016-07-21 17:32:03 +0200
committerJoas Schilling <coding@schilljs.com>2016-07-21 17:32:03 +0200
commitc2e76908b71ca6a65fb1d588fa8c9ee2f6470913 (patch)
tree468be84db4dd530d2beca2d05416d0ca857c4a85 /.mailmap
parent3ae6254d352e96a46446ed060a137369e07c2663 (diff)
downloadnextcloud-server-c2e76908b71ca6a65fb1d588fa8c9ee2f6470913.tar.gz
nextcloud-server-c2e76908b71ca6a65fb1d588fa8c9ee2f6470913.zip
Fix more mailmap entries
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap15
1 files changed, 8 insertions, 7 deletions
diff --git a/.mailmap b/.mailmap
index 66dde6287e6..f160206ac9c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -39,6 +39,7 @@ Björn Schießle <bjoern@schiessle.org> Björn Schießle <schiesbn@potato.(none)
Björn Schießle <bjoern@schiessle.org> Björn Schiessle <schiessle@owncloud.com>
Björn Schießle <bjoern@schiessle.org> Bjoern Schießle <schiessle@owncloud.com>
Björn Schießle <bjoern@schiessle.org> Bjoern Schiessle <schiessle@owncloud.com>
+Björn Schießle <bjoern@schiessle.org> Björn Schießle <schiessle@owncloud.com>
BlackEagle <ike.devolder@gmail.com>
Boris Rybalkin <ribalkin@gmail.com>
Borjan Tchakaloff <borjan@tchakaloff.fr>
@@ -302,13 +303,13 @@ Riccardo Iaconelli <riccardo@kde.org>
Richard Clarkson <robert@trash-mail.com>
rnveach <rveach02@gmail.com>
Robert Jäckel <rjaeckel@users.noreply.github.com>
-Robin Appelman <icewind@owncloud.com> icewind1991 <icewind1991@gmail.com>
-Robin Appelman <icewind@owncloud.com> icewind1991 <robin@icewind.nl>
-Robin Appelman <icewind@owncloud.com> Robin <Robin Appelman icewind1991@gmail.com>
-Robin Appelman <icewind@owncloud.com> Robin <robin@Amaya.(none)>
-Robin Appelman <icewind@owncloud.com> Robin Appelman <icewind1991@gmail.com>
-Robin Appelman <icewind@owncloud.com> Robin Appelman <icewind1991@gmail>
-Robin Appelman <icewind@owncloud.com> Robin Appelman <robin@icewind.nl>
+Robin Appelman <robin@icewind.nl> icewind1991 <icewind1991@gmail.com>
+Robin Appelman <robin@icewind.nl> icewind1991 <robin@icewind.nl>
+Robin Appelman <robin@icewind.nl> Robin <Robin Appelman icewind1991@gmail.com>
+Robin Appelman <robin@icewind.nl> Robin <robin@Amaya.(none)>
+Robin Appelman <robin@icewind.nl> Robin Appelman <icewind1991@gmail.com>
+Robin Appelman <robin@icewind.nl> Robin Appelman <icewind1991@gmail>
+Robin Appelman <robin@icewind.nl> Robin Appelman <icewind@owncloud.com>
Robin McCorkell <robin@mccorkell.me.uk> Robin McCorkell <rmccorkell@karoshi.org.uk>
Robin McCorkell <robin@mccorkell.me.uk> Robin McCorkell <rmccorkell@owncloud.com>
Rodrigo Hjort <rodrigo.hjort@gmail.com>