aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorRobin McCorkell <rmccorkell@owncloud.com>2015-12-24 11:51:37 +0000
committerRobin McCorkell <rmccorkell@owncloud.com>2015-12-24 11:51:37 +0000
commita09ffaedb4925799de0e1de91d984f1c97a7c0c6 (patch)
tree380a2283a47f510560f30de6f8c8467654c53566 /.mailmap
parentfd96331e590198407bf813fba2505b63f3212e1f (diff)
downloadnextcloud-server-a09ffaedb4925799de0e1de91d984f1c97a7c0c6.tar.gz
nextcloud-server-a09ffaedb4925799de0e1de91d984f1c97a7c0c6.zip
Correct mailmap for Robin McCorkell to robin@mccorkell.me.uk
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index ec69fc5318e..7d6e6c7ee5d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -305,7 +305,8 @@ 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 McCorkell <rmccorkell@karoshi.org.uk> Robin McCorkell <rmccorkell@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>
Roeland Jago Douma <rullzer@owncloud.com> Roeland Jago Douma <roeland@famdouma.nl>
rok <brejktru@gmail.com>