summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2017-05-31 20:13:56 +0200
committervarac <varacanero@zeromail.org>2017-05-31 20:14:48 +0200
commit428f9750fbe9f9675c6d560bd5b88e7784a9f381 (patch)
treecde2416bd4712a8ff53feb54aac9a71a46a79e02 /.mailmap
parentd30bc71483efdaf78ae0b0de5ad774631854e6b3 (diff)
Update mailmap
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap69
1 files changed, 67 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 047dbad..84d2096 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,26 +1,91 @@
# LEAP core team
-drebs <drebs@leap.se> drebs <drebs@riseup.net>
+aguestuser <aguestuser@riseup.net> aguestuser <aguestuser@risup.net>
+
+Azul <azul@leap.se> azul <azul@leap.se>
+Azul <azul@leap.se> Azul <azul@riseup.net>
+Azul <azul@leap.se> azul <azul@riseup.net>
+
+Drebs <drebs@leap.se> drebs <drebs@riseup.net>
+Drebs <drebs@leap.se> db <drebs@riseup.net>
+Drebs <drebs@leap.se> db <db@leap.se>
+Drebs <drebs@leap.se> drebs <drebs@leap.se>
+Drebs <drebs@leap.se> drebs <drebs@joselito.semvergonha.org>
Elijah <elijah@riseup.net> elijah <elijah@ChrUbuntu.(none)>
Elijah <elijah@riseup.net> elijah <elijah@riseup.net>
Elijah <elijah@riseup.net> Elijah Sparrow <elijah@riseup.net>
+Kali Kaneko <kali@leap.se> kali <kali@leap.se>
+Kali Kaneko <kali@leap.se> Kali <kali@leap.se>
Kali Kaneko <kali@leap.se> Kali Kaneko (leap communications) <kali@leap.se>
Kali Kaneko <kali@leap.se> Kali Kaneko <kali@futeisha.org>
+Kali Kaneko <kali@leap.se> kali <kali@futeisha.org>
+Kali Kaneko <kali@leap.se> kali <kali@katsi>
+
Kwadronaut <kwadronaut@leap.se> kwadronaut <kwadronaut@leap.se>
Kwadronaut <kwadronaut@leap.se> Kwadronaut <kwadronaut@leap.se>
Kwadronaut <kwadronaut@leap.se> kwadronaut <kwadronaut@autistici.org>
-Leap Admins <admin@leap.se> root <root@localhost>
+Kwadronaut <kwadronaut@leap.se> kwadronaut <kwadronaut@aktivix.org>
+Kwadronaut <kwadronaut@leap.se> kwadronaut <kwadronaut@hazelaar.boomgaard>
+Kwadronaut <kwadronaut@leap.se> KwadroNaut <kwadronaut@puscii.nl>
+Kwadronaut <kwadronaut@leap.se> KwadroNaut <KwadroNaut@users.noreply.github.com>
+
+LEAP Admins <admin@leap.se> root <root@localhost>
+LEAP Admins <admin@leap.se> Leap Admins <sysdev@leap.se>
+LEAP Admins <admin@leap.se> root <root@greyhound.leap.se>
+LEAP Admins <admin@leap.se> GitLab Runner <gitlab-runner@greyhound.leap.se>
+LEAP Admins <admin@leap.se> root <root@urchin.dev.bitmask.net>
+
+Meskio <meskio@sindominio.net> meskio on windows <meskio@leap.se>
+Meskio <meskio@sindominio.net> Meskio <meskio@sindominio.org>
+Meskio <meskio@sindominio.net> Ruben Pollan <meskio@sindominio.net>
Micah Anderson <micah@leap.se> Micah Anderson <micah@riseup.net>
Micah Anderson <micah@leap.se> micah <micah@leap.se>
Micah Anderson <micah@leap.se> micah <micah@riseup.net>
+
Varac <varac@leap.se> Varac <varacanero@zeromail.org>
Varac <varac@leap.se> varac <varacanero.zeromail.org>
Varac <varac@leap.se> Varac <varac@users.noreply.github.com>
Varac <varac@leap.se> root <root@mail.bitrigger.de>
+Varac <varac@leap.se> root <root@lab.bitrigger.de>
+Varac <varac@leap.se> varac <varac@leap.se>
+
Victor Shyba <victor1984@riseup.net> Victor Shyba <victor.shyba@gmail.com>
+# ex team members
+Isis Lovecruft <isis@torproject.org> Isis Agora Lovecruft <isis@torproject.org>
+
+Ivan Alejandro <ivanalejandro0@gmail.com> Ivan Alejandro <ivanalejandro0@yahoo.com.ar>
+
+Jessib <jessib@riseup.net> jessib <jessib@leap.se>
+Jessib <jessib@riseup.net> jessib <jessib@riseup.net>
+Parménides GV <parmegv@sdf.org> parmegv <parmegv@sdf.org>
+Parménides GV <parmegv@sdf.org> Parménides GV <parmegv@ma.sdf.org>
+
+Tomás Touceda <chiiph@leap.se> Tomas Touceda <chiiph@gmail.com>
+Tomás Touceda <chiiph@leap.se> Tomas Touceda <chiiph@leap.se>
+Tomás Touceda <chiiph@leap.se> Tomás Touceda <chiiph@leap.se>
+Tomás Touceda <chiiph@leap.se> Tomas Touceda <chiiph@riseup.net>
+Tomás Touceda <chiiph@leap.se> chiiph <chiiph@chiiphs-MacBook-Air.local>
+Tomás Touceda <chiiph@leap.se> chiiph <chiiph@delloise.(none)>
+
# Pixelated
Bruno Wagner Goncalves <bwagner@thoughtworks.com> Bruno Wagner Gonçalves <bwgpro@gmail.com>
Bruno Wagner Goncalves <bwagner@thoughtworks.com> Bruno Wagner Gonçalves <bwagner@riseup.net>
Bruno Wagner Goncalves <bwagner@thoughtworks.com> Bruno Wagner <bwagner@riseup.net>
Bruno Wagner Goncalves <bwagner@thoughtworks.com> Bruno Wagner <bwgpro@gmail.com>
Christoph Kluenter <ckluente@thoughtworks.com> Christoph <chris@inferno.nadir.org>
+Christoph Kluenter <ckluente@thoughtworks.com> Christoph <ckluente@thoughtworks.com>
+Christoph Kluenter <ckluente@thoughtworks.com> Christoph Kluenter <ckluente@thouthworks.com>
+
+Duda Dornelles <ddornell@thoughtworks.com> Duda Dornelles <dudassdornelles@gmail.com>
+
+# RGSOC
+Klaus Fl <kfleerko@thoughtworks.com> kaeff <hi@kaeff.net>
+
+theaamanda <ta.kupler@posteo.de> theaamanda <theaamanda@users.noreply.github.com>
+theaamanda <ta.kupler@posteo.de> thea <ta.kupler@gmail.com>
+
+
+# External contributors
+Arne Schwabe <arne@blinkt.de> Arne Schwabe <arne@rfc2549.org>
+guido <guido@bruo.org> guido <guido@dis.tur.bio>
+Paixu Aabuizia <PaixuAabuizia@users.noreply.github.com> PaixuAabuizia <PaixuAabuizia@users.noreply.github.com>