aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2016-07-21 14:48:26 +0200
committerRoeland Jago Douma <roeland@famdouma.nl>2016-07-21 14:48:26 +0200
commitfac430ea9a2430e38c835f23c582d673cf04916a (patch)
treee030aaaad0d415320120c67f800308d298bd3f18
parentdc5608d15ae3425beefd7a33203093865222684b (diff)
downloadnextcloud-server-fac430ea9a2430e38c835f23c582d673cf04916a.tar.gz
nextcloud-server-fac430ea9a2430e38c835f23c582d673cf04916a.zip
Fix e-mail in mailmap
-rw-r--r--.mailmap4
1 files changed, 2 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 41d9ad6e582..66dde6287e6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -312,8 +312,8 @@ Robin Appelman <icewind@owncloud.com> Robin Appelman <robin@icewind.nl>
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>
-Roeland Jago Douma <rullzer@owncloud.com> Roeland Jago Douma <roeland@famdouma.nl>
-Roeland Jago Douma <rullzer@owncloud.com> Roeland Douma <rullzer@users.noreply.github.com>
+Roeland Jago Douma <roeland@famdouma.nl> Roeland Jago Douma <rullzer@owncloud.com>
+Roeland Jago Douma <roeland@famdouma.nl> Roeland Douma <rullzer@users.noreply.github.com>
rok <brejktru@gmail.com>
Roland Hager <roland.hager@tu-berlin.de>
Roland van Laar <roland@micite.net>