aboutsummaryrefslogtreecommitdiffhomepage
path: root/AUTHORS
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2019-08-03 09:54:11 +0200
committerArthurHoaro <arthur@hoa.ro>2019-08-03 09:54:11 +0200
commit58fa1a6ad1596c0b5425a48ca79f71d3791f6a92 (patch)
treeb50e27e0fc8ffef43edd8c8bf97e5d966f0b098c /AUTHORS
parented3365325d231e044dedc32608fde87b1b39fa34 (diff)
parent3a52dfcc5c5d6de08bb6e9b16ea7033408184bef (diff)
downloadShaarli-58fa1a6ad1596c0b5425a48ca79f71d3791f6a92.tar.gz
Shaarli-58fa1a6ad1596c0b5425a48ca79f71d3791f6a92.tar.zst
Shaarli-58fa1a6ad1596c0b5425a48ca79f71d3791f6a92.zip
Merge branch 'master' into v0.11
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS7
1 files changed, 4 insertions, 3 deletions
diff --git a/AUTHORS b/AUTHORS
index 755d1bae..50593218 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,10 +1,10 @@
1 769 ArthurHoaro <arthur@hoa.ro> 1 782 ArthurHoaro <arthur@hoa.ro>
2 401 VirtualTam <virtualtam@flibidi.net> 2 401 VirtualTam <virtualtam@flibidi.net>
3 216 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 13 Luce Carević <lcarevic@access42.net>
8 12 Nicolas Danelon <hi@nicolasmd.com.ar> 8 12 Nicolas Danelon <hi@nicolasmd.com.ar>
9 9 Willi Eggeling <thewilli@gmail.com> 9 9 Willi Eggeling <thewilli@gmail.com>
10 8 Christophe HENRY <christophe.henry@sbgodin.fr> 10 8 Christophe HENRY <christophe.henry@sbgodin.fr>
@@ -61,6 +61,7 @@
61 1 Rajat Hans <rajathans9@gmail.com> 61 1 Rajat Hans <rajathans9@gmail.com>
62 1 Sbgodin <Sbgodin@users.noreply.github.com> 62 1 Sbgodin <Sbgodin@users.noreply.github.com>
63 1 TsT <tst2005@gmail.com> 63 1 TsT <tst2005@gmail.com>
64 1 agentcobra <agentcobra@free.fr>
64 1 dimtion <zizou.xena@gmail.com> 65 1 dimtion <zizou.xena@gmail.com>
65 1 durcheinandr <jochen@durcheinandr.de> 66 1 durcheinandr <jochen@durcheinandr.de>
66 1 lapineige <lapineige@users.noreply.github.com> 67 1 lapineige <lapineige@users.noreply.github.com>