diff options
author | makechanges <makechanges@riseup.net> | 2017-06-05 10:27:59 -0700 |
---|---|---|
committer | makechanges <makechanges@riseup.net> | 2017-06-05 10:27:59 -0700 |
commit | d606594ed10af516d14fe33707d5652f5db85962 (patch) | |
tree | 5abc4068fc6264572769703a7cfe806f2e4be3e2 /.mailmap | |
parent | 4ff8f264a895a42ce2e78bbbf7a677e00bb3f347 (diff) | |
parent | 0798cf92de0066c33e3ca2a45ca0170d2f1c81e0 (diff) |
update
Merge branch 'master' of ssh://leap.se/secrets
Diffstat (limited to '.mailmap')
-rw-r--r-- | .mailmap | 120 |
1 files changed, 97 insertions, 23 deletions
@@ -1,26 +1,100 @@ +# https://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html + # LEAP core team -drebs <drebs@leap.se> drebs <drebs@riseup.net> -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 Kaneko (leap communications) <kali@leap.se> -Kali Kaneko <kali@leap.se> Kali Kaneko <kali@futeisha.org> -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> -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> -Victor Shyba <victor1984@riseup.net> Victor Shyba <victor.shyba@gmail.com> +aguestuser <aguestuser@riseup.net> <aguestuser@risup.net> + +Azul <azul@leap.se> +Azul <azul@leap.se> <azul@riseup.net> + +Drebs <drebs@leap.se> +Drebs <drebs@leap.se> <drebs@riseup.net> +Drebs <drebs@leap.se> <db@leap.se> +Drebs <drebs@leap.se> <drebs@joselito.semvergonha.org> + +Elijah <elijah@riseup.net> +Elijah <elijah@riseup.net> <elijah@ChrUbuntu.(none)> + +Kali Kaneko <kali@leap.se> +Kali Kaneko <kali@leap.se> <kali@leap.se> +Kali Kaneko <kali@leap.se> <kali@futeisha.org> +Kali Kaneko <kali@leap.se> <kali@katsi> + +Kwadronaut <kwadronaut@leap.se> +Kwadronaut <kwadronaut@leap.se> <kwadronaut@autistici.org> +Kwadronaut <kwadronaut@leap.se> <kwadronaut@aktivix.org> +Kwadronaut <kwadronaut@leap.se> <kwadronaut@hazelaar.boomgaard> +Kwadronaut <kwadronaut@leap.se> <kwadronaut@puscii.nl> +Kwadronaut <kwadronaut@leap.se> <KwadroNaut@users.noreply.github.com> + +LEAP Admins <admin@leap.se> +LEAP Admins <admin@leap.se> <root@localhost> +LEAP Admins <admin@leap.se> <sysdev@leap.se> +LEAP Admins <admin@leap.se> <root@greyhound.leap.se> +LEAP Admins <admin@leap.se> <gitlab-runner@greyhound.leap.se> +LEAP Admins <admin@leap.se> <root@urchin.dev.bitmask.net> +LEAP Admins <admin@leap.se> <leap@leap32> +LEAP Admins <admin@leap.se> <leap@leap64.leap> + +Meskio <meskio@sindominio.net> +Meskio <meskio@sindominio.net> <meskio@leap.se> +Meskio <meskio@sindominio.net> <meskio@sindominio.org> + +Micah Anderson <micah@leap.se> +Micah Anderson <micah@leap.se> <micah@riseup.net> + +Varac <varac@leap.se> +Varac <varac@leap.se> <varacanero@zeromail.org> +Varac <varac@leap.se> <varacanero.zeromail.org> +Varac <varac@leap.se> <varac@users.noreply.github.com> +Varac <varac@leap.se> <root@mail.bitrigger.de> +Varac <varac@leap.se> <root@lab.bitrigger.de> + +Victor Shyba <victor1984@riseup.net> <victor.shyba@gmail.com> + +# ex team members +Ben Carrillo <ben@futeisha.org> + +Isis Lovecruft <isis@torproject.org> + +Ivan Alejandro <ivanalejandro0@gmail.com> <ivanalejandro0@yahoo.com.ar> + +Jessib <jessib@riseup.net> +Jessib <jessib@riseup.net> jessib <jessib@leap.se> + +Parménides GV <parmegv@sdf.org> +Parménides GV <parmegv@sdf.org> <parmegv@ma.sdf.org> + +Tomás Touceda <chiiph@leap.se> +Tomás Touceda <chiiph@leap.se> <chiiph@gmail.com> +Tomás Touceda <chiiph@leap.se> <chiiph@riseup.net> +Tomás Touceda <chiiph@leap.se> <chiiph@chiiphs-MacBook-Air.local> +Tomás Touceda <chiiph@leap.se> <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> +Bruno Wagner Goncalves <bwagner@thoughtworks.com> +Bruno Wagner Goncalves <bwagner@thoughtworks.com> <bwgpro@gmail.com> +Bruno Wagner Goncalves <bwagner@thoughtworks.com> <bwagner@riseup.net> +Bruno Wagner Goncalves <bwagner@thoughtworks.com> <bwgpro@gmail.com> + +Christoph Kluenter <ckluente@thoughtworks.com> +Christoph Kluenter <ckluente@thoughtworks.com> <chris@inferno.nadir.org> +Christoph Kluenter <ckluente@thoughtworks.com> <ckluente@thouthworks.com> + +Duda Dornelles <ddornell@thoughtworks.com> +Duda Dornelles <ddornell@thoughtworks.com> <dudassdornelles@gmail.com> + +# RGSOC +Klaus Fl <kfleerko@thoughtworks.com> +Klaus Fl <kfleerko@thoughtworks.com> kaeff <hi@kaeff.net> + +theaamanda <ta.kupler@posteo.de> +theaamanda <ta.kupler@posteo.de> theaamanda <theaamanda@users.noreply.github.com> +theaamanda <ta.kupler@posteo.de> thea <ta.kupler@gmail.com> + +luca-marie <ml.kochsiek@fu-berlin.de> + + +# External contributors +Arne Schwabe <arne@blinkt.de> <arne@rfc2549.org> +guido <guido@bruo.org> <guido@dis.tur.bio> +Paixu Aabuizia <PaixuAabuizia@users.noreply.github.com> <PaixuAabuizia@users.noreply.github.com> |