summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2016-03-01 17:45:05 +0100
committerLukas Reschke <lukas@owncloud.com>2016-03-01 17:45:05 +0100
commitc430f5ba53e02efb373667c8baf59f0209d3bfeb (patch)
tree1fb193c847d8c83cda2ba319ddcb0112747b36fd /.mailmap
parent933f60e3147ad872acf3211dc826ebf528434681 (diff)
downloadnextcloud-server-c430f5ba53e02efb373667c8baf59f0209d3bfeb.tar.gz
nextcloud-server-c430f5ba53e02efb373667c8baf59f0209d3bfeb.zip
Map Maci
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 1 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 7d6e6c7ee5d..3fdaa301b16 100644
--- a/.mailmap
+++ b/.mailmap
@@ -174,8 +174,8 @@ Jean-Louis Dupond <jean-louis@dupond.be>
Jenkins for ownCloud <owncloud-bot@tmit.eu> Jenkins for ownCloud <thomas.mueller@tmit.eu>
Jens-Christian Fischer <jens-christian.fischer@switch.ch>
Jernej Virag <jernej.virag@gmail.com>
-Jesus Macias <jmacias@full-on-net.com>
Jesus Macias Portela <jesus.macias.portela@gmail.com>
+Jesús Macias <jmacias@solidgear.es> Jesus Macias <jmacias@full-on-net.com>
jknockaert <jasper@knockaert.nl>
Joan <aseques@gmail.com>
Joar Wandborg <git@wandborg.com>