Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	discordHelperWin.py
This commit is contained in:
Maximilien Rigaut 2022-06-26 05:29:38 +02:00
commit 31f68c92b8
No known key found for this signature in database
GPG Key ID: 4F14B23709ADA5B1

Diff Content Not Available