pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-04-07 14:04:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/hotfix/v6.2.2' into develop

Browse Source 
# Conflicts:
#	Common/config/development-mac.json
#	Common/config/development-windows.json
#	Common/sources/commondefines.js
#	Common/sources/utils.js
This commit is contained in:
Sergey Konovalov
2021-05-11 14:53:54 +03:00
parent d621fa3d43 cd93ba1d9f
commit 0106f04034
8 changed files with 72 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Common/package.json
View File

@ -23,6 +23,7 @@
"node-statsd": "^0.1.1",
"openpgp": "^4.10.8",
"request": "^2.88.0",
"request-filtering-agent": "^1.0.5",
"rhea": "^0.3.9",
"uri-js": "^4.2.2",
"win-ca": "^3.4.5"