X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=.mailmap;h=a98467cd3258fd8b2d88c60901aa7e539acbbff9;hb=a638f16d06ceb0e2bf924aa4ea8f16cffa867b70;hp=5d73372ccc1d1b7b4f98cff7648d386c962296ab;hpb=fe65caf5fb1a353e4ec971b6c638bdfccfa90b78;p=koha-ffzg.git

diff --git a/.mailmap b/.mailmap
index 5d73372ccc..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,6 +74,7 @@ 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>
@@ -118,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>
@@ -132,6 +137,7 @@ 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>
@@ -139,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>
@@ -168,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>
@@ -281,6 +291,8 @@ Russel Garlick <russel.garlick@liblime.com>                   <russel@ahinui.loc
 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>
@@ -288,6 +300,8 @@ 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>
@@ -299,6 +313,9 @@ Stan Brinkerhoff <stan@brinkerhoff.org>                       <stan@koha-dev.hsd
 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>
@@ -322,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>