aboutsummaryrefslogtreecommitdiffhomepage
path: root/AUTHORS
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2020-10-13 12:07:13 +0200
committerArthurHoaro <arthur@hoa.ro>2020-10-13 12:07:13 +0200
commitd9f6275ebca035fec8331652c677981056793ccc (patch)
tree37a64baf4f0eba6b781040605965383d8aded2cc /AUTHORS
parent38672ba0d1c722e5d6d33a58255ceb55e9410e46 (diff)
parentd63ff87a009313141ae684ec447b902562ff6ee7 (diff)
downloadShaarli-d9f6275ebca035fec8331652c677981056793ccc.tar.gz
Shaarli-d9f6275ebca035fec8331652c677981056793ccc.tar.zst
Shaarli-d9f6275ebca035fec8331652c677981056793ccc.zip
Merge branch 'v0.11' into stablestable
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS12
1 files changed, 8 insertions, 4 deletions
diff --git a/AUTHORS b/AUTHORS
index f91a770e..50593218 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,7 +1,8 @@
1 716 ArthurHoaro <arthur@hoa.ro> 1 782 ArthurHoaro <arthur@hoa.ro>
2 372 VirtualTam <virtualtam@flibidi.net> 2 401 VirtualTam <virtualtam@flibidi.net>
3 208 nodiscc <nodiscc@gmail.com> 3 218 nodiscc <nodiscc@gmail.com>
4 56 Sébastien Sauvage <sebsauvage@sebsauvage.net> 4 56 Sébastien Sauvage <sebsauvage@sebsauvage.net>
5 16 Luce Carević <lcarevic@access42.net>
5 15 Florian Eula <eula.florian@gmail.com> 6 15 Florian Eula <eula.florian@gmail.com>
6 13 Emilien Klein <emilien@klein.st> 7 13 Emilien Klein <emilien@klein.st>
7 12 Nicolas Danelon <hi@nicolasmd.com.ar> 8 12 Nicolas Danelon <hi@nicolasmd.com.ar>
@@ -15,12 +16,12 @@
15 4 Alexandre Alapetite <alexandre@alapetite.fr> 16 4 Alexandre Alapetite <alexandre@alapetite.fr>
16 4 David Sferruzza <david.sferruzza@gmail.com> 17 4 David Sferruzza <david.sferruzza@gmail.com>
17 4 Immánuel Fodor <immanuelfactor+github@gmail.com> 18 4 Immánuel Fodor <immanuelfactor+github@gmail.com>
19 3 Agurato <mail.vmonot@gmail.com>
18 3 Teromene <teromene@teromene.fr> 20 3 Teromene <teromene@teromene.fr>
19 2 Alexandre G.-Raymond <alex@ndre.gr> 21 2 Alexandre G.-Raymond <alex@ndre.gr>
20 2 Chris Kuethe <chris.kuethe@gmail.com> 22 2 Chris Kuethe <chris.kuethe@gmail.com>
21 2 Felix Bartels <felix@host-consultants.de> 23 2 Felix Bartels <felix@host-consultants.de>
22 2 Knah Tsaeb <Knah-Tsaeb@knah-tsaeb.org> 24 2 Knah Tsaeb <Knah-Tsaeb@knah-tsaeb.org>
23 2 Luce Carević <lcarevic@access42.net>
24 2 Mathieu Chabanon <git@matchab.fr> 25 2 Mathieu Chabanon <git@matchab.fr>
25 2 Miloš Jovanović <mjovanovic@gmail.com> 26 2 Miloš Jovanović <mjovanovic@gmail.com>
26 2 Qwerty <champlywood@free.fr> 27 2 Qwerty <champlywood@free.fr>
@@ -29,6 +30,7 @@
29 2 julienCXX <software@chmodplusx.eu> 30 2 julienCXX <software@chmodplusx.eu>
30 2 philipp-r <philipp-r@users.noreply.github.com> 31 2 philipp-r <philipp-r@users.noreply.github.com>
31 2 pips <pips@e5150.fr> 32 2 pips <pips@e5150.fr>
33 2 trailjeep <trailjeep@gmail.com>
32 1 Adrien Oliva <adrien.oliva@yapbreak.fr> 34 1 Adrien Oliva <adrien.oliva@yapbreak.fr>
33 1 Adrien le Maire <adrien@alemaire.be> 35 1 Adrien le Maire <adrien@alemaire.be>
34 1 Alexis J <alexis@effingo.be> 36 1 Alexis J <alexis@effingo.be>
@@ -56,8 +58,10 @@
56 1 Mark Gerarts <mark.gerarts@gmail.com> 58 1 Mark Gerarts <mark.gerarts@gmail.com>
57 1 Marsup <marsup@gmail.com> 59 1 Marsup <marsup@gmail.com>
58 1 Neros <contact@neros.fr> 60 1 Neros <contact@neros.fr>
61 1 Rajat Hans <rajathans9@gmail.com>
59 1 Sbgodin <Sbgodin@users.noreply.github.com> 62 1 Sbgodin <Sbgodin@users.noreply.github.com>
60 1 TsT <tst2005@gmail.com> 63 1 TsT <tst2005@gmail.com>
64 1 agentcobra <agentcobra@free.fr>
61 1 dimtion <zizou.xena@gmail.com> 65 1 dimtion <zizou.xena@gmail.com>
62 1 durcheinandr <jochen@durcheinandr.de> 66 1 durcheinandr <jochen@durcheinandr.de>
63 1 lapineige <lapineige@users.noreply.github.com> 67 1 lapineige <lapineige@users.noreply.github.com>