summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-06-25 14:14:14 +0200
committerMorris Jobke <hey@morrisjobke.de>2015-06-25 14:14:14 +0200
commit0032cddb400dc3e29bf77cef6ffb2c7e0ac8449a (patch)
tree9e9d110c594ac180329b65e992b73bb4f12a040d /.mailmap
parentf63915d0c8b28ed507f0db6e11ef50e9a0bd39f4 (diff)
downloadnextcloud-server-0032cddb400dc3e29bf77cef6ffb2c7e0ac8449a.tar.gz
nextcloud-server-0032cddb400dc3e29bf77cef6ffb2c7e0ac8449a.zip
add additional email address for Georg
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 381e339df40..a6cf996587c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -140,6 +140,7 @@ Georg Ehrke <georg@owncloud.com> Georg Ehrke <developer@georgehrke.com>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <georg.stefan.germany@googlemail.com>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <ownclouddev@georgswebsite.de>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <devgeorg@ownCloud.com>
+Georg Ehrke <georg@owncloud.com> Georg Ehrke <georg@ownCloud.com>
Golnaz Nilieh <g382nilieh@gmail.com>
Grundik <grundik@ololo.cc>
Guillaume AMAT <guillaume.amat@informatique-libre.com>