merge with develop

This commit is contained in:
Maxim Kadushkin
2019-11-28 17:11:18 +03:00
352 changed files with 12994 additions and 4409 deletions

View File

@ -1,7 +1,7 @@
{
"name": "spreadsheeteditor",
"version": "4.3.0",
"build": 884,
"build": 886,
"homepage": "http://www.onlyoffice.com",
"private": true,
"main": {
@ -161,6 +161,12 @@
"cwd": "../apps/spreadsheeteditor/main/resources/formula-lang",
"src": "*",
"dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/formula-lang"
},
{
"expand": true,
"cwd": "../apps/common/main/resources/symboltable",
"src": "*",
"dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/symboltable"
}
],
"help": [