diff options
| author | VirtualTam <virtualtam+github@flibidi.net> | 2018-01-04 19:00:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-04 19:00:48 +0100 |
| commit | fdb4fee4330067f13ff8ee15e3222ee2736e7bc1 (patch) | |
| tree | 50203398b7f38aef648be5004048657fe11e21d8 /.github | |
| parent | 17dee65651445de9abf377c962a45d71c9ad0f91 (diff) | |
| parent | 2fadf88068f9398a6e2dfd787b95fce5ad1117a4 (diff) | |
| download | Shaarli-fdb4fee4330067f13ff8ee15e3222ee2736e7bc1.tar.gz Shaarli-fdb4fee4330067f13ff8ee15e3222ee2736e7bc1.tar.zst Shaarli-fdb4fee4330067f13ff8ee15e3222ee2736e7bc1.zip | |
Merge pull request #1047 from virtualtam/changelog
Update changelog, documentation and authors
Diffstat (limited to '.github')
| -rw-r--r-- | .github/mailmap | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.github/mailmap b/.github/mailmap index bbdb7908..7633afcf 100644 --- a/.github/mailmap +++ b/.github/mailmap | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | ArthurHoaro <arthur@hoa.ro> | 1 | ArthurHoaro <arthur@hoa.ro> |
| 2 | Florian Eula <eula.florian@gmail.com> feula | 2 | Florian Eula <eula.florian@gmail.com> feula |
| 3 | Florian Eula <eula.florian@gmail.com> <mr.pikzen@gmail.com> | 3 | Florian Eula <eula.florian@gmail.com> <mr.pikzen@gmail.com> |
| 4 | Immánuel Fodor <immanuelfactor+github@gmail.com> | ||
| 5 | kalvn <kalvnthereal@gmail.com> <kalvn@users.noreply.github.com> | ||
| 4 | Nicolas Danelon <hi@nicolasmd.com.ar> nicolasm | 6 | Nicolas Danelon <hi@nicolasmd.com.ar> nicolasm |
| 5 | Nicolas Danelon <hi@nicolasmd.com.ar> <nda@3818.com.ar> | 7 | Nicolas Danelon <hi@nicolasmd.com.ar> <nda@3818.com.ar> |
| 6 | Nicolas Danelon <hi@nicolasmd.com.ar> <nicolasdanelon@gmail.com> | 8 | Nicolas Danelon <hi@nicolasmd.com.ar> <nicolasdanelon@gmail.com> |