aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-10-06 09:52:19 +0200
committerMorris Jobke <hey@morrisjobke.de>2015-10-06 09:52:19 +0200
commit8366ce27673b82349361e534853256dc869a8f93 (patch)
tree9c26ee069192350ce0ffea67518a7baacbb69ac0 /.mailmap
parentb945d713845d640d63241de4d5a67813384b88ce (diff)
downloadnextcloud-server-8366ce27673b82349361e534853256dc869a8f93.tar.gz
nextcloud-server-8366ce27673b82349361e534853256dc869a8f93.zip
deduplicate @xenopathic
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 1 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index a6cf996587c..95841a36353 100644
--- a/.mailmap
+++ b/.mailmap
@@ -304,7 +304,7 @@ 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@karoshi.org.uk> Robin McCorkell <rmccorkell@owncloud.com>
Rodrigo Hjort <rodrigo.hjort@gmail.com>
Roeland Jago Douma <roeland@famdouma.nl>
rok <brejktru@gmail.com>