Merge remote-tracking branch 'remotes/origin/fix/bug-59392' into release/v7.4.0

# Conflicts:
#	scripts/base.py
#	scripts/deploy_desktop.py
#	scripts/develop/config_server.py
This commit is contained in:
Sergey Konovalov
2023-06-05 01:15:48 +03:00
4 changed files with 87 additions and 16 deletions

View File

@ -133,6 +133,8 @@ def make():
base.support_old_versions_plugins(js_dir + "/sdkjs-plugins")
base.clone_marketplace_plugin(root_dir + "/sdkjs-plugins")
license = base.readFileLicence(js_dir + "/sdkjs/word/sdk-all-min.js")
base.correct_plugins_branding(root_dir + "/sdkjs-plugins", license=license)
# tools
tools_dir = root_dir + "/server/tools"