summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2016-07-04 15:19:47 +0200
committerThomas Müller <DeepDiver1975@users.noreply.github.com>2016-07-04 15:19:47 +0200
commit8147eefaeba3822c9331283e973006ad3aeac1f5 (patch)
treef42b85fcf42f984a950cdf4c062f322863317a26 /.mailmap
parent6b4b337e533a7df17feeac770c4c8bfba1a3a293 (diff)
downloadnextcloud-server-8147eefaeba3822c9331283e973006ad3aeac1f5.tar.gz
nextcloud-server-8147eefaeba3822c9331283e973006ad3aeac1f5.zip
Change nickvergessen mailmap entry (#25349)
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index b96269235cf..41d9ad6e582 100644
--- a/.mailmap
+++ b/.mailmap
@@ -182,7 +182,8 @@ 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>
-Joas Schilling <nickvergessen@owncloud.com> Joas Schilling <nickvergessen@gmx.de>
+Joas Schilling <coding@schilljs.com> Joas Schilling <nickvergessen@gmx.de>
+Joas Schilling <coding@schilljs.com> Joas Schilling <nickvergessen@owncloud.com>
joel hansson <joel.hansson@gmail.com>
Johan Björk <johanimon@gmail.com>
Johannes Twittmann <github.com@deryo.de>