Merge branch 'master' into updatesmf21
jdarwood007

jdarwood007 commited on 2023-02-11 17:15:01
Showing 1 changed files, with 0 additions and 0 deletions.


# Conflicts:
#	.github/scripts/check-license.php
#	install-sd.php
#	package-info.xml
#	sd_source/SimpleDesk-AdminPlugins.php
#	sd_source/Subs-SimpleDesk.php