Merge remote-tracking branch 'upstream/master'

This commit is contained in:
bri cassa 2022-08-26 14:59:13 +02:00
commit 3732bd9920
1 changed files with 2 additions and 0 deletions

2
.mailmap Normal file
View File

@ -0,0 +1,2 @@
Wuzzy <Wuzzy@disroot.org> <Wuzzy2@mail.ru>
Wuzzy <Wuzzy@disroot.org> <almikes@aol.com>