Merge remote-tracking branch 'upstream/master' into develop

This commit is contained in:
Nick Brassel 2021-07-27 10:11:52 +10:00
commit 394272a266
26 changed files with 394 additions and 559 deletions

View file

@ -1,6 +1,6 @@
/* Copyright 2020 ZSA Technology Labs, Inc <@zsa>
* Copyright 2020 Jack Humbert <jack.humb@gmail.com>
* Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by