aboutsummaryrefslogtreecommitdiffhomepage
path: root/.github
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2017-10-07 12:12:34 +0200
committerGitHub <noreply@github.com>2017-10-07 12:12:34 +0200
commita01437f9e1e4fb5a098877b243828bf6f4936562 (patch)
treee4e5101a110eb33bc23c70197d44ca2d001698ca /.github
parentbe9ddff2fb8706ce575e95e8cd64458411895dbe (diff)
parent6770135b0aca9ca3399c74afa6f2f9ce47fd6a05 (diff)
downloadShaarli-a01437f9e1e4fb5a098877b243828bf6f4936562.tar.gz
Shaarli-a01437f9e1e4fb5a098877b243828bf6f4936562.tar.zst
Shaarli-a01437f9e1e4fb5a098877b243828bf6f4936562.zip
Merge pull request #988 from ArthurHoaro/changelog-0.9.2
Changelog 0.9.2 + AUTHORS
Diffstat (limited to '.github')
-rw-r--r--.github/mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.github/mailmap b/.github/mailmap
index 41d91e47..bbdb7908 100644
--- a/.github/mailmap
+++ b/.github/mailmap
@@ -11,3 +11,5 @@ Timo Van Neerden <fire@lehollandaisvolant.net> lehollandaisvolant <levoltigeurho
11VirtualTam <virtualtam@flibidi.net> <tamisier.aurelien@gmail.com> 11VirtualTam <virtualtam@flibidi.net> <tamisier.aurelien@gmail.com>
12VirtualTam <virtualtam@flibidi.net> <virtualtam+github@flibidi.net> 12VirtualTam <virtualtam@flibidi.net> <virtualtam+github@flibidi.net>
13VirtualTam <virtualtam@flibidi.net> <virtualtam@flibidi.org> 13VirtualTam <virtualtam@flibidi.net> <virtualtam@flibidi.org>
14Willi Eggeling <thewilli@gmail.com> <mail@wje-online.de>
15Willi Eggeling <thewilli@gmail.com> <thewilli@users.noreply.github.com>