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

Merge remote-tracking branch 'remotes/origin/release/1.12.0' into develop

Browse Source 
# Conflicts:
#	web/documentserver-example/nodejs/public/assets/document-formats
This commit is contained in:
Sergey Linnik
2025-02-06 18:22:44 +03:00
parent fad5afb32d d4aaa38414
commit 28ed07733a
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitmodules vendored
View File

@ -5,7 +5,6 @@
[submodule "web/documentserver-example/nodejs/public/assets/document-formats"] [submodule "web/documentserver-example/nodejs/public/assets/document-formats"]
path = web/documentserver-example/nodejs/public/assets/document-formats path = web/documentserver-example/nodejs/public/assets/document-formats
url = https://github.com/ONLYOFFICE/document-formats url = https://github.com/ONLYOFFICE/document-formats
branch = feature/v8.3
[submodule "web/documentserver-example/csharp-mvc/assets/document-templates"] [submodule "web/documentserver-example/csharp-mvc/assets/document-templates"]
path = web/documentserver-example/csharp-mvc/assets/document-templates path = web/documentserver-example/csharp-mvc/assets/document-templates
url = https://github.com/ONLYOFFICE/document-templates url = https://github.com/ONLYOFFICE/document-templates

2
web/documentserver-example/nodejs/public/assets/document-formats

Submodule web/documentserver-example/nodejs/public/assets/document-formats updated: 6597955ee7...db08f048d9