summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2015-10-26 13:56:50 +0100
committerLukas Reschke <lukas@owncloud.com>2015-10-26 14:01:11 +0100
commit52ba14ed055ef2a89d3babb1c5543327d05acfe0 (patch)
tree79aa8073e2a6e86d1747983462e5affbde9f7308 /.mailmap
parentf2a7888c5cdcdbfc49ea33a4f1e0535f2afa2695 (diff)
downloadnextcloud-server-52ba14ed055ef2a89d3babb1c5543327d05acfe0.tar.gz
nextcloud-server-52ba14ed055ef2a89d3babb1c5543327d05acfe0.zip
Update .mailmap
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 95841a36353..ec69fc5318e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -129,6 +129,7 @@ Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <frank@oc.(none)>
Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <karlitschek@gmx.de>
Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <karlitschek@kde.org>
François Kubler <francois@kubler.org>
+Frédéric Fortier <frederic.fortier@oronospolytechnique.com> Frédéric Fortier <frederic.fortier@polymtl.ca>
Frederik Gladhorn <gladhorn@kde.org>
Gadzy <dev@gadzy.fr>
ganomi <ganomi@gmail.com>
@@ -306,7 +307,7 @@ Robin Appelman <icewind@owncloud.com> Robin Appelman <icewind1991@gmail>
Robin Appelman <icewind@owncloud.com> Robin Appelman <robin@icewind.nl>
Robin McCorkell <rmccorkell@karoshi.org.uk> Robin McCorkell <rmccorkell@owncloud.com>
Rodrigo Hjort <rodrigo.hjort@gmail.com>
-Roeland Jago Douma <roeland@famdouma.nl>
+Roeland Jago Douma <rullzer@owncloud.com> Roeland Jago Douma <roeland@famdouma.nl>
rok <brejktru@gmail.com>
Roland Hager <roland.hager@tu-berlin.de>
Roland van Laar <roland@micite.net>