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

Merge branch 'hotfix/v5.2.4' into develop

Browse Source 
# Conflicts:
#	cell/model/FormulaObjects/parserFormula.js
#	cell/model/Serialize.js
#	cell/model/Workbook.js
#	cell/view/WorksheetView.js
#	word/Editor/Document.js
#	word/Editor/DocumentContentElementBase.js
#	word/Editor/Paragraph_Recalculate.js
#	word/Editor/Table.js
This commit is contained in:
Alexander.Trofimov
2018-12-11 17:18:03 +03:00
parent fa0476d47e ecff698f7f
commit 2408c86aa0
67 changed files with 2036 additions and 1194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -12,7 +12,7 @@ BUILD_NUMBER ?= 0
PUBLISHER_NAME ?= Ascensio System SIA
APP_COPYRIGHT ?= Copyright (C) $(subst ",\",$(PUBLISHER_NAME)) 2012-$(shell date +%Y). All rights reserved
APP_COPYRIGHT ?= Copyright (C) $(PUBLISHER_NAME) 2012-$(shell date +%Y). All rights reserved
PUBLISHER_URL ?= https://www.onlyoffice.com/