Merge branch 'master' into dev

This commit is contained in:
alstjr7375 2022-12-07 11:56:34 +09:00
commit 529baece76
21 changed files with 368 additions and 146 deletions

10
CREDITS
View file

@ -26,10 +26,16 @@ N: Jani Haiko
E: haiko.jani@gmail.com
W: https://github.com/ojaha065
N: kanlukasz
W: https://github.com/kanlukasz
N: nikkehtine
E: nikkehtine@int.pl
W: https://github.com/nikkehtine
N: OSS.kr
W: https://www.oss.kr/
----------
Contributors
@ -109,6 +115,10 @@ W: https://github.com/Nyubis
N: roland-rollo
W: https://github.com/roland-rollo
N: ryenyuku
E: teamworks1732@gmail.com
W: https://github.com/ryenyuku
N: SanderTheDragon
E: sanderthedragon@zoho.com
W: https://gitlab.com/SanderTheDragon