diff options
author | ArthurHoaro <arthur@hoa.ro> | 2020-09-30 11:59:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-30 11:59:42 +0200 |
commit | 95158e7565b8f091e0781d30ef48d369c42e37c7 (patch) | |
tree | d334fc02e0a43f5b65acf5f40994ef60f16c62d8 /.github/mailmap | |
parent | c3fca560b624588d37508142ab73573caf467573 (diff) | |
parent | 22e75f062db959a0c55838d4b786b3cc128bd33c (diff) | |
download | Shaarli-95158e7565b8f091e0781d30ef48d369c42e37c7.tar.gz Shaarli-95158e7565b8f091e0781d30ef48d369c42e37c7.tar.zst Shaarli-95158e7565b8f091e0781d30ef48d369c42e37c7.zip |
Merge pull request #1576 from ArthurHoaro/release/v0.12.0-beta-1/changelog
Update CHANGELOG and AUTHOR
Diffstat (limited to '.github/mailmap')
-rw-r--r-- | .github/mailmap | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.github/mailmap b/.github/mailmap index 366946e8..15a25e43 100644 --- a/.github/mailmap +++ b/.github/mailmap | |||
@@ -3,6 +3,7 @@ ArthurHoaro <arthur@hoa.ro> Arthur | |||
3 | Florian Eula <eula.florian@gmail.com> feula | 3 | Florian Eula <eula.florian@gmail.com> feula |
4 | Florian Eula <eula.florian@gmail.com> <mr.pikzen@gmail.com> | 4 | Florian Eula <eula.florian@gmail.com> <mr.pikzen@gmail.com> |
5 | Immánuel Fodor <immanuelfactor+github@gmail.com> | 5 | Immánuel Fodor <immanuelfactor+github@gmail.com> |
6 | Immánuel Fodor <immanuelfactor+github@gmail.com> Immánuel! <21174107+immanuelfodor@users.noreply.github.com> | ||
6 | kalvn <kalvnthereal@gmail.com> <kalvn@users.noreply.github.com> | 7 | kalvn <kalvnthereal@gmail.com> <kalvn@users.noreply.github.com> |
7 | kalvn <kalvnthereal@gmail.com> <kalvn@pm.me> | 8 | kalvn <kalvnthereal@gmail.com> <kalvn@pm.me> |
8 | Neros <contact@neros.fr> <NerosTie@users.noreply.github.com> | 9 | Neros <contact@neros.fr> <NerosTie@users.noreply.github.com> |