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
Files
f340aa4a97920d100d0307a1e616d1098748d6d5
document-server-integration/web
History
Sergey Linnik f340aa4a97 Merge remote-tracking branch 'remotes/origin/release/1.15.0' into develop 
# Conflicts:
#	web/documentserver-example/csharp-mvc/assets/document-formats
#	web/documentserver-example/csharp/assets/document-formats
#	web/documentserver-example/go/static/assets/document-formats
#	web/documentserver-example/java/src/main/resources/assets/document-formats
#	web/documentserver-example/nodejs/public/assets/document-formats
#	web/documentserver-example/php/assets/document-formats
#	web/documentserver-example/python/assets/document-formats
#	web/documentserver-example/ruby/assets/document-formats
2025-10-15 10:49:25 +03:00
..
documentserver-example
Merge remote-tracking branch 'remotes/origin/release/1.15.0' into develop
2025-10-15 10:49:25 +03:00