aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorVirtualTam <virtualtam@flibidi.net>2018-01-04 18:52:52 +0100
committerVirtualTam <virtualtam@flibidi.net>2018-01-04 18:52:52 +0100
commit2fadf88068f9398a6e2dfd787b95fce5ad1117a4 (patch)
tree50203398b7f38aef648be5004048657fe11e21d8
parentf452d3c4dff32003e7be10b3704bd4b1e23d7ad4 (diff)
downloadShaarli-2fadf88068f9398a6e2dfd787b95fce5ad1117a4.tar.gz
Shaarli-2fadf88068f9398a6e2dfd787b95fce5ad1117a4.tar.zst
Shaarli-2fadf88068f9398a6e2dfd787b95fce5ad1117a4.zip
Update AUTHORS and contributor mailmap
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
-rw-r--r--.github/mailmap2
-rw-r--r--AUTHORS12
2 files changed, 10 insertions, 4 deletions
diff --git a/.github/mailmap b/.github/mailmap
index bbdb7908..7633afcf 100644
--- a/.github/mailmap
+++ b/.github/mailmap
@@ -1,6 +1,8 @@
1ArthurHoaro <arthur@hoa.ro> 1ArthurHoaro <arthur@hoa.ro>
2Florian Eula <eula.florian@gmail.com> feula 2Florian Eula <eula.florian@gmail.com> feula
3Florian Eula <eula.florian@gmail.com> <mr.pikzen@gmail.com> 3Florian Eula <eula.florian@gmail.com> <mr.pikzen@gmail.com>
4Immánuel Fodor <immanuelfactor+github@gmail.com>
5kalvn <kalvnthereal@gmail.com> <kalvn@users.noreply.github.com>
4Nicolas Danelon <hi@nicolasmd.com.ar> nicolasm 6Nicolas Danelon <hi@nicolasmd.com.ar> nicolasm
5Nicolas Danelon <hi@nicolasmd.com.ar> <nda@3818.com.ar> 7Nicolas Danelon <hi@nicolasmd.com.ar> <nda@3818.com.ar>
6Nicolas Danelon <hi@nicolasmd.com.ar> <nicolasdanelon@gmail.com> 8Nicolas Danelon <hi@nicolasmd.com.ar> <nicolasdanelon@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 105561c1..6c4d9529 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,6 @@
1 537 ArthurHoaro <arthur@hoa.ro> 1 574 ArthurHoaro <arthur@hoa.ro>
2 252 VirtualTam <virtualtam@flibidi.net> 2 277 VirtualTam <virtualtam@flibidi.net>
3 148 nodiscc <nodiscc@gmail.com> 3 169 nodiscc <nodiscc@gmail.com>
4 56 Sébastien Sauvage <sebsauvage@sebsauvage.net> 4 56 Sébastien Sauvage <sebsauvage@sebsauvage.net>
5 15 Florian Eula <eula.florian@gmail.com> 5 15 Florian Eula <eula.florian@gmail.com>
6 13 Emilien Klein <emilien@klein.st> 6 13 Emilien Klein <emilien@klein.st>
@@ -11,8 +11,9 @@
11 5 Lucas Cimon <lucas.cimon@gmail.com> 11 5 Lucas Cimon <lucas.cimon@gmail.com>
12 4 Alexandre Alapetite <alexandre@alapetite.fr> 12 4 Alexandre Alapetite <alexandre@alapetite.fr>
13 4 David Sferruzza <david.sferruzza@gmail.com> 13 4 David Sferruzza <david.sferruzza@gmail.com>
14 4 kalvn <kalvnthereal@gmail.com>
15 3 Immánuel Fodor <immanuelfactor+github@gmail.com>
14 3 Teromene <teromene@teromene.fr> 16 3 Teromene <teromene@teromene.fr>
15 3 kalvn <kalvnthereal@gmail.com>
16 2 Chris Kuethe <chris.kuethe@gmail.com> 17 2 Chris Kuethe <chris.kuethe@gmail.com>
17 2 Knah Tsaeb <Knah-Tsaeb@knah-tsaeb.org> 18 2 Knah Tsaeb <Knah-Tsaeb@knah-tsaeb.org>
18 2 Mathieu Chabanon <git@matchab.fr> 19 2 Mathieu Chabanon <git@matchab.fr>
@@ -27,6 +28,7 @@
27 1 BoboTiG <bobotig@gmail.com> 28 1 BoboTiG <bobotig@gmail.com>
28 1 Bronco <bronco@warriordudimanche.net> 29 1 Bronco <bronco@warriordudimanche.net>
29 1 D Low <daniellowtw@gmail.com> 30 1 D Low <daniellowtw@gmail.com>
31 1 Daniel Jakots <vigdis@chown.me>
30 1 Dimtion <zizou.xena@gmail.com> 32 1 Dimtion <zizou.xena@gmail.com>
31 1 Fanch <fanch-github@qth.fr> 33 1 Fanch <fanch-github@qth.fr>
32 1 Felix Bartels <felix@host-consultants.de> 34 1 Felix Bartels <felix@host-consultants.de>
@@ -41,6 +43,8 @@
41 1 Lionel Martin <renarddesmers@gmail.com> 43 1 Lionel Martin <renarddesmers@gmail.com>
42 1 Mark Gerarts <mark.gerarts@gmail.com> 44 1 Mark Gerarts <mark.gerarts@gmail.com>
43 1 Marsup <marsup@gmail.com> 45 1 Marsup <marsup@gmail.com>
46 1 Neros <contact@neros.fr>
44 1 Sbgodin <Sbgodin@users.noreply.github.com> 47 1 Sbgodin <Sbgodin@users.noreply.github.com>
45 1 TsT <tst2005@gmail.com> 48 1 TsT <tst2005@gmail.com>
46 1 dimtion <zizou.xena@gmail.com> 49 1 dimtion <zizou.xena@gmail.com>
50 1 durcheinandr <jochen@durcheinandr.de>