diff options
| author | ArthurHoaro <arthur@hoa.ro> | 2017-10-07 12:22:54 +0200 |
|---|---|---|
| committer | ArthurHoaro <arthur@hoa.ro> | 2017-10-07 12:22:54 +0200 |
| commit | 80b15f5d2db8b90fd9b29f94e6bd8652340df4f0 (patch) | |
| tree | b4826cbb03c64b0e5ffb6d0a72f21e0f6b9d9ac8 /AUTHORS | |
| parent | 1ea88ae7d1b7fb13e18f543e7c2ad99c4ccde19a (diff) | |
| parent | a01437f9e1e4fb5a098877b243828bf6f4936562 (diff) | |
| download | Shaarli-80b15f5d2db8b90fd9b29f94e6bd8652340df4f0.tar.gz Shaarli-80b15f5d2db8b90fd9b29f94e6bd8652340df4f0.tar.zst Shaarli-80b15f5d2db8b90fd9b29f94e6bd8652340df4f0.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 11 |
1 files changed, 7 insertions, 4 deletions
| @@ -1,14 +1,16 @@ | |||
| 1 | 506 ArthurHoaro <arthur@hoa.ro> | 1 | 537 ArthurHoaro <arthur@hoa.ro> |
| 2 | 204 VirtualTam <virtualtam@flibidi.net> | 2 | 252 VirtualTam <virtualtam@flibidi.net> |
| 3 | 147 nodiscc <nodiscc@gmail.com> | 3 | 148 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> |
| 7 | 12 Nicolas Danelon <hi@nicolasmd.com.ar> | 7 | 12 Nicolas Danelon <hi@nicolasmd.com.ar> |
| 8 | 9 Willi Eggeling <thewilli@gmail.com> | ||
| 8 | 8 Christophe HENRY <christophe.henry@sbgodin.fr> | 9 | 8 Christophe HENRY <christophe.henry@sbgodin.fr> |
| 10 | 6 B. van Berkum <dev@dotmpe.com> | ||
| 11 | 5 Lucas Cimon <lucas.cimon@gmail.com> | ||
| 9 | 4 Alexandre Alapetite <alexandre@alapetite.fr> | 12 | 4 Alexandre Alapetite <alexandre@alapetite.fr> |
| 10 | 4 David Sferruzza <david.sferruzza@gmail.com> | 13 | 4 David Sferruzza <david.sferruzza@gmail.com> |
| 11 | 3 Lucas Cimon <lucas.cimon@gmail.com> | ||
| 12 | 3 Teromene <teromene@teromene.fr> | 14 | 3 Teromene <teromene@teromene.fr> |
| 13 | 3 kalvn <kalvnthereal@gmail.com> | 15 | 3 kalvn <kalvnthereal@gmail.com> |
| 14 | 2 Chris Kuethe <chris.kuethe@gmail.com> | 16 | 2 Chris Kuethe <chris.kuethe@gmail.com> |
| @@ -37,6 +39,7 @@ | |||
| 37 | 1 Kevin Canévet <kevin@streamroot.io> | 39 | 1 Kevin Canévet <kevin@streamroot.io> |
| 38 | 1 Knah Tsaeb <knah-tsaeb@knah-tsaeb.org> | 40 | 1 Knah Tsaeb <knah-tsaeb@knah-tsaeb.org> |
| 39 | 1 Lionel Martin <renarddesmers@gmail.com> | 41 | 1 Lionel Martin <renarddesmers@gmail.com> |
| 42 | 1 Mark Gerarts <mark.gerarts@gmail.com> | ||
| 40 | 1 Marsup <marsup@gmail.com> | 43 | 1 Marsup <marsup@gmail.com> |
| 41 | 1 Sbgodin <Sbgodin@users.noreply.github.com> | 44 | 1 Sbgodin <Sbgodin@users.noreply.github.com> |
| 42 | 1 TsT <tst2005@gmail.com> | 45 | 1 TsT <tst2005@gmail.com> |