Merge remote-tracking branch 'upstream/master' into develop
This commit is contained in:
commit
394272a266
26 changed files with 394 additions and 559 deletions
|
@ -1,4 +1,6 @@
|
|||
/* Copyright 2018 Jack Humbert <jack.humb@gmail.com>
|
||||
* Copyright 2015 ZSA Technology Labs Inc (@zsa)
|
||||
* 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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue