aboutsummaryrefslogtreecommitdiffhomepage
path: root/AUTHORS
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2020-11-12 13:02:36 +0100
committerArthurHoaro <arthur@hoa.ro>2020-11-12 13:02:36 +0100
commit1409f1c89a7ca01456ae2dcd6357d296e2b99f5a (patch)
treeffa30a9358e82d27be75d8fc5e57f3c8820dc6d3 /AUTHORS
parent054e03f37fa29da8066f1a637919f13c7e7dc5d2 (diff)
parenta6935feb22df8d9634189ee87d257da9f03eedbd (diff)
downloadShaarli-1409f1c89a7ca01456ae2dcd6357d296e2b99f5a.tar.gz
Shaarli-1409f1c89a7ca01456ae2dcd6357d296e2b99f5a.tar.zst
Shaarli-1409f1c89a7ca01456ae2dcd6357d296e2b99f5a.zip
Merge branch 'master' into v0.12v0.12.1v0.12
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS5
1 files changed, 4 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 0ec52acc..be815364 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
1 991 ArthurHoaro <arthur@hoa.ro> 1 1097 ArthurHoaro <arthur@hoa.ro>
2 402 VirtualTam <virtualtam@flibidi.net> 2 402 VirtualTam <virtualtam@flibidi.net>
3 294 nodiscc <nodiscc@gmail.com> 3 294 nodiscc <nodiscc@gmail.com>
4 56 Sébastien Sauvage <sebsauvage@sebsauvage.net> 4 56 Sébastien Sauvage <sebsauvage@sebsauvage.net>
@@ -25,6 +25,7 @@
25 2 Alexandre G.-Raymond <alex@ndre.gr> 25 2 Alexandre G.-Raymond <alex@ndre.gr>
26 2 Chris Kuethe <chris.kuethe@gmail.com> 26 2 Chris Kuethe <chris.kuethe@gmail.com>
27 2 Felix Bartels <felix@host-consultants.de> 27 2 Felix Bartels <felix@host-consultants.de>
28 2 Ganesh Kandu <kanduganesh@gmail.com>
28 2 Guillaume Virlet <github@virlet.org> 29 2 Guillaume Virlet <github@virlet.org>
29 2 Knah Tsaeb <Knah-Tsaeb@knah-tsaeb.org> 30 2 Knah Tsaeb <Knah-Tsaeb@knah-tsaeb.org>
30 2 Mathieu Chabanon <git@matchab.fr> 31 2 Mathieu Chabanon <git@matchab.fr>
@@ -39,6 +40,7 @@
39 2 pips <pips@e5150.fr> 40 2 pips <pips@e5150.fr>
40 2 trailjeep <trailjeep@gmail.com> 41 2 trailjeep <trailjeep@gmail.com>
41 2 yude <yudesleepy@gmail.com> 42 2 yude <yudesleepy@gmail.com>
43 2 yudete <yu@yude.moe>
42 1 Adrien Oliva <adrien.oliva@yapbreak.fr> 44 1 Adrien Oliva <adrien.oliva@yapbreak.fr>
43 1 Adrien le Maire <adrien@alemaire.be> 45 1 Adrien le Maire <adrien@alemaire.be>
44 1 Alexis J <alexis@effingo.be> 46 1 Alexis J <alexis@effingo.be>
@@ -65,6 +67,7 @@
65 1 Kevin Masson <kevin.masson@methodinthemadness.eu> 67 1 Kevin Masson <kevin.masson@methodinthemadness.eu>
66 1 Knah Tsaeb <knah-tsaeb@knah-tsaeb.org> 68 1 Knah Tsaeb <knah-tsaeb@knah-tsaeb.org>
67 1 Lionel Martin <renarddesmers@gmail.com> 69 1 Lionel Martin <renarddesmers@gmail.com>
70 1 Loïc Carr <zizou.xena@gmail.com>
68 1 Mark Gerarts <mark.gerarts@gmail.com> 71 1 Mark Gerarts <mark.gerarts@gmail.com>
69 1 Marsup <marsup@gmail.com> 72 1 Marsup <marsup@gmail.com>
70 1 Paul van den Burg <github@paulvandenburg.nl> 73 1 Paul van den Burg <github@paulvandenburg.nl>