summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-02-25 13:50:46 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-03-26 11:38:39 +0100
commita228b4ccba88111fbf06c130623f3c8630eaa7b6 (patch)
treee2970241027b87fbe6a215a3e8a69c5759fb4d8d /.mailmap
parent69f14f974b2acd385809b508f22aa5c15e70d801 (diff)
downloadnextcloud-server-a228b4ccba88111fbf06c130623f3c8630eaa7b6.tar.gz
nextcloud-server-a228b4ccba88111fbf06c130623f3c8630eaa7b6.zip
Updating .mailmap
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap10
1 files changed, 6 insertions, 4 deletions
diff --git a/.mailmap b/.mailmap
index 7cef9962f6a..b3119ff76d7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -32,10 +32,12 @@ Bernhard Posselt <dev@bernhard-posselt.com> Bernhard Posselt <nukeawhale@gmail.c
Bernhard Posselt <dev@bernhard-posselt.com> Bernhard Posselt <Raydiation@users.noreply.github.com>
Bernhard Reiter <ockham@raz.or.at>
Birk Borkason <daniel.niccoli@gmail.com>
-Bjoern Schießle <schiessle@owncloud.com> Bjoern Schiessle <schiesbn@woody.(none)>
-Bjoern Schießle <schiessle@owncloud.com> Björn Schießle <bjoern@schiessle.org>
-Bjoern Schießle <schiessle@owncloud.com> Björn Schießle <schiesbn@potato.(none)>
-Bjoern Schießle <schiessle@owncloud.com> Björn Schiessle <schiessle@owncloud.com>
+Björn Schießle <schiessle@owncloud.com> Bjoern Schiessle <schiesbn@woody.(none)>
+Björn Schießle <schiessle@owncloud.com> Björn Schießle <bjoern@schiessle.org>
+Björn Schießle <schiessle@owncloud.com> Björn Schießle <schiesbn@potato.(none)>
+Björn Schießle <schiessle@owncloud.com> Björn Schiessle <schiessle@owncloud.com>
+Björn Schießle <schiessle@owncloud.com> Bjoern Schießle <schiessle@owncloud.com>
+Björn Schießle <schiessle@owncloud.com> Bjoern Schiessle <schiessle@owncloud.com>
BlackEagle <ike.devolder@gmail.com>
Boris Rybalkin <ribalkin@gmail.com>
Borjan Tchakaloff <borjan@tchakaloff.fr>