X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=.mailmap;h=a98467cd3258fd8b2d88c60901aa7e539acbbff9;hb=bb5d95749bd597953fad17ba4cc3f5262d538ff2;hp=c339ee46b4d4648cd7efc5321f7750cde20486c8;hpb=88d2db265cdd72c002d15ba322bf2ebe4db5d429;p=koha-ffzg.git

diff --git a/.mailmap b/.mailmap
index c339ee46b4..a98467cd32 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,5 @@
 Abby Robertson                                                <abbyrobnz@gmail.com>
+Adam Styles                                                   <adam.styles@esa.edu.au>
 Agustín Moyano                                                <agustinmoyano@theke.io>
 Ahmed                                                         <ahmed@inlibro.com>
 Alan Millar                                                   <amillar>
@@ -20,6 +21,7 @@ Antoine Farnault <toins@biblibre.com>                         <toins>
 Arnaud Laurin <alaurin@biblibre.com>                          <alaurin>
 Arnaud Laurin                                                 <alaurin@biblibre.com>
 Ava Li                                                        <rubyli208@gmail.com>
+Azucena Aguayo                                                <Azucena.Aguayo@uvu.edu>
 <bart@catalystacademy.net.nz>                                 <bart.tj@gmail.com>
 Barton Chittenden                                             <barton@bywatersolutions.com>
 Benedict P. Barszcz                                           <kb2qzv>
@@ -60,6 +62,7 @@ Chris Nighswonger <cnighswonger@foundations.edu>              <cnighswonger@cnig
 Chris Nighswonger <cnighswonger@foundations.edu>              Koha User <koha@dev.(none)>
 Chris Nighswonger <cnighswonger@foundations.edu>              <chris.nighswonger@gmail.com>
 Christophe Croullebois                                        <christophe.croullebois@biblibre.com>
+Christophe Torin                                              <christophe.torin@univ-rennes2.fr>
 Claudia Forsman                                               <claudia.forsman@gmail.com>
 Colin Campbell                                                <colin.campbell@ptfs-europe.com>
 <connor.dewar@catalystacademy.net.nz>                         <connor.dewar@gmail.com>
@@ -71,9 +74,11 @@ Darrell Ulm <darrellulm@smfpl.org>                            koha <koha@smfpl.o
 Darrell Ulm <darrellulm@smfpl.org>                            root <root@newkoha32.local>
 David Cook                                                    <dcook@prosentient.com.au>
 David Gustafsson <glasklas@gmail.com>                         <root@f1ebe1bec408>
+David Schmidt                                                 <davewood@gmx.at>
 David Schuster                                                <dschust1@gmail.com>
 David Strainchamps                                            <lavide>
 Dobrica Pavlinušić                                            <dpavlin@rot13.org>
+Donna Bachowski                                               <donna@bywatersolutions.com>
 Dorian Meid                                                   <dnmeid>
 doXulting                                                     <doxulting>
 D Ruth Bavousett                                              <David.Bavousett@liblime.com>
@@ -117,6 +122,7 @@ Genevieve Plantin <genevieve.plantin@inlibro.com>             <genevieve.plantin
 Greg Barniskis                                                <gbarniskis@gmail.com>
 Gus Ellerm                                                    <gel1163@stacmail.net>
 Gynn Lomax <gynn@katipo.co.nz>                                truth_nz <truth_nz>
+Hayley Pelham                                                 <hayleymapley@catalyst.net.nz>
 Héctor Eduardo Castro Avalos                                  <hector.hecaxmmx@gmail.com>
 Helene Hickey                                                 <hickeyhe@wgc.school.nz>
 Henri-Damien LAURENT                                          <henridamien.laurent@biblibre.com>
@@ -125,11 +131,13 @@ Henri-Damien LAURENT <henridamien.laurent@biblibre.com>       Henri-Damien LAURE
 Henri-Damien LAURENT <henridamien.laurent@biblibre.com>       <root@descartes.biblibre.com>
 Henri-Damien LAURENT <henridamien.laurent@biblibre.com>       <root@henridamienlaurent.dyndns.org>
 Holger Meißner <holger.meissner@hs-gesundheit.de>             <h.meissner.82@web.de>
+Holly Cooper                                                  <hc@interleaf.ie>
 H. Passini                                                    <hpassini>
 Ian Walls                                                     <hsl@nyumc.org>
 Ian Walls                                                     <ian.walls@bywatersolutions.com>
 Ian Walls <koha.sekjal@gmail.com>                             <sekjal@Samael.local>
 Indranil Das Gupta <indradg@l2c2.co.in>                       Indranil Das Gupta (L2C2 Technologies) <indradg@l2c2.co.in>
+Jake                                                          Deery <jake.deery@ptfs-europe.com>
 Jane Wagner <jwagner@ptfs.com>                                <dev2@debKOHA2.corporate.ptfs.com>
 Janusz Kaczmarek                                              <januszop@gmail.com>
 Jared Camins-Esakov <jcamins@cpbibliography.com>              <camins@numismatics.org>
@@ -137,6 +145,7 @@ Jared Camins-Esakov <jcamins@cpbibliography.com>              <jcamins@bywaterso
 Jared Camins-Esakov <jcamins@cpbibliography.com>              <koha@cpbibliography.com>
 Jared Camins-Esakov                                           <jcamins@cpbibliography.com>
 Jatara Barnes                                                 <jendayi30@gmail.com>
+Jérémy Breuillard                                             <jeremy.breuillard@biblibre.com>
 Jérôme Charaoui                                               <jcharaoui@cmaisonneuve.qc.ca>
 Jérome Vizcaino                                               <plugz>
 Jesse Weaver <pianohacker@gmail.com>                          <pianohacker@gmail.com>
@@ -166,12 +175,15 @@ Julian Maurice <julian.maurice@biblibre.com>                  koha <koha@cmspub1
 Julian Maurice <julian.maurice@biblibre.com>                  koha <koha@kohaprep1.di.u-psud.fr>
 Justin Vos                                                    <justinvos@live.com>
 <kate@catalystacademy.net.nz>                                 <kate.h@paradise.net.nz>
-Katrin Fischer <katrin.fischer@web.de>                        <katrin.fischer.83@web.de>
+Katrin Fischer <katrin.fischer.83@web.de>                     <katrin.fischer@web.de>
 Katrin Fischer                                                <katrin.fischer@bsz-bw.de>
 Katrin Fischer <katrin.fischer@bsz-bw.de>                     <Katrin.Fischer@bsz-bw.de>
 Katrin Fischer <katrin.fischer@bsz-bw.de>                     Koha <koha@koha-dev.de>
+Kelly McElligott                                              <kelly@bywatersolutions.com>
 Kenza Zaki <kenza.zaki@biblibre.com>                          <root@kenza-VirtualBox>
+Kevin Carnes                                                  <kevin.carnes@ub.lu.se>
 Koha Translators                                              <root@translate.koha-community.org>
+Kris Wehipeihana                                              <kriswehipeihana@catalyst.net.nz>
 Kyle M Hall <kyle@bywatersolutions.com>                       <migrations@bywatersolutions.com>
 Kyle M Hall <kyle@bywatersolutions.com>                       <“staff@bywatersolutions.com”>
 Kyle M Hall <kyle@bywatersolutions.com>                       John Doe <you@example.com>
@@ -191,6 +203,7 @@ Liz Rea <wizzyrea@gmail.com>                                  root <root@lists.n
 Liz Rea <wizzyrea@gmail.com>                                  root <root@liz-koha.nekls.org>
 Lyon 3 Team                                                   <koha@univ-lyon3.fr>
 Lyon 3 Team <koha@univ-lyon3.fr>                              Lyon3 Team <preprod@koha.(none)>
+Lyon 3 Team <koha@univ-lyon3.fr>                              <koha@univ-lyon.fr>
 Magnus Enger <magnus.enger@kul.oslo.kommune.no>               <digitalutvikling@gmail.com>
 Magnus Enger                                                  <magnus.enger@kul.oslo.kommune.no>
 Magnus Enger                                                  <magnus@enger.priv.no>
@@ -199,6 +212,7 @@ Marcel de Rooy                                                <m.de.rooy@rijksmu
 Marcel de Rooy <m.de.rooy@rijksmuseum.nl>                     <M.de.Rooy@rijksmuseum.nl>
 Marcel de Rooy <m.de.rooy@rijksmuseum.nl>                     <root@master.rijkskoha.nl>
 Marc Véron                                                    <veron@veron.ch>
+Marjorie Barry-Vila                                           <marjorie.barry-vila@collecto.ca
 Martin Renvoize <martin.renvoize@ptfs-europe.com>             <martin@dev1.vm.bytemark.co.uk>
 Mason James                                                   <mason.james@liblime.com>
 Mason James <mason@katipo.co.nz>                              sushi <sushi>
@@ -258,6 +272,7 @@ Petter Goksøyr Åsen <petter.goksoyr.asen@kul.oslo.kommune.no> <boutrosboutrosb
 Petter Goksøyr Åsen                                           <petter.goksoyr.asen@kul.oslo.kommune.no>
 Philippe Audet-Fortin                                         <philippe.audet-fortin@inlibro.com>
 Philippe Blouin                                               <philippe.blouin@inlibro.com>
+Philippe Blouin                                               <blou@inlibro.com>
 Pierre Cauchois                                               <cauchoip>
 Pierrick Le Gall <pierreck@ineo.com>                          <plg>
 Polytechnic University Koha Installation                      <poly-pro@builder.(none)>
@@ -275,6 +290,9 @@ Roger Buck                                                    <saas>
 Russel Garlick <russel.garlick@liblime.com>                   <russel@ahinui.local>
 Ryan Higgins <rch@balrog.liblime.com>                         <rch@false.(none)>
 Ryan Higgins <rch@liblime.com>                                <rych>
+Sally Healey                                                  <sally.Healey@cheshirewestandchester.gov.uk>
+Sally Healey                                                  <sally.healey@cheshiresharedservices.gov.uk>
+Salman Ali                                                    <salman.ali@inLibro.com>
 Sam Sanders <sam-sanders@catalystacademy.net.nz>              <sam-sanders@live.com>
 Samuel Crosby                                                 <scrosby000@gmail.com>
 Savitra Sirohi                                                <savitra.sirohi@osslabs.biz>
@@ -282,20 +300,28 @@ Serge Renaux                                                  <sergerenaux>
 Séverine Queune                                               <severine.queune@bulac.fr>
 Séverine Queune                                               <severine.queune@gmail.com>
 Shaun Evans                                                   <shaunevans>
+Shi Yao Wang                                                  <shi-yao.wang@inlibro.com>
+Shi Yao Wang                                                  <shiyao@inlibro.com>
 Silvia Simonetti                                              <s.simonetti@cineca.it>
 Simith D'Oliveira                                             <simith@inlibro.com>
 Simon Blake <simon@katipo.co.nz>                              <simon>
 Sonia Lemaire                                                 <sonia.lemaire@biblibre.com>
+Sonia Bouis                                                   <sonia.bouis@univ-lyon3.fr>
 Srdjan Janković                                               <srdjan@catalyst.net.nz>
 Stan Brinkerhoff <stan@brinkerhoff.org>                       <stan@brinkerhoff.org>
 Stan Brinkerhoff <stan@brinkerhoff.org>                       <stan@koha-dev.hsd1.vt.comcast.net>
 Stéphane Delaune                                              <stephane.delaune@biblibre.com>
 Stephen Hedges <shedges@myacpl.org>                           <shedges>
 Steve Tonnesen                                                <tonnesen>
+The Minh Luong                                                <theminh@inlibro.com>
+The Minh Luong                                                <the-minh.luong@inlibro.com>
+Thibaud Guillot                                               <thibaud.guillot@biblibre.com>
 Thomas Dukleth <git@agogme.com>                               <git@agogme.com>
 Thomas Dukleth <git@agogme.com>                               <thd>
 Thomas Wright <thomasw@catalystacademy.net.nz>                <tomsStudy@gmail.com>
+Todd Goatley                                                  <tgoatley@gmail.com>
 Tomás Cohen Arazi                                             <tcohen@psi.unc.edu.ar>
+Tomás Cohen Arazi                                             <tomascohen@unc.edu.ar>
 Tomás Cohen Arazi <tomascohen@theke.io>                       <tomascohen@gmail.com>
 Tomás Cohen Arazi                                             <tomascohen@theke.io>
 <tom@catalystacademy.net.nz>                                  <thomas.houlker@hibs.school.nz>
@@ -313,7 +339,9 @@ Zeno Tajoli <z.tajoli@cineca.it>                              <ztajoli@gmail.com
 American Numismatics Society <sponsor>                        America Numismatic Society <sponsor>
 Association KohaLa <sponsor>                                  Association KohaLa - https://koha-fr.org/ <sponsor>
 Bibliothèque Universitaire des Langues et Civilisations (BULAC) <sponsor> BULAC - http://www.bulac.fr/ <sponsor>
+Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) <sponsor>  Bibliotheksservice-Zentrum Baden-Wuerttemberg <sponsor>
 Catalyst <sponsor>                                            Catalyst IT <sponsor>
+Catalyst <sponsor>                                            Catalyst IT, New Zealand <sponsor>
 Centre collégial des services regroupés <sponsor>             CCSR <sponsor>
 Centre collégial des services regroupés <sponsor>             CCSR ( http://www.ccsr.qc.ca ) <sponsor>
 Dataly Tech <sponsor>                                         Dataly Tech [https://dataly.gr/] <sponsor>