mirror of
https://github.com/ONLYOFFICE/document-server-integration.git
synced 2026-04-07 14:06:11 +08:00
495435c8ff
# Conflicts: # web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs # web/documentserver-example/csharp-mvc/Models/FileModel.cs # web/documentserver-example/csharp-mvc/WebEditor.ashx.cs # web/documentserver-example/csharp/DocEditor.aspx.cs # web/documentserver-example/csharp/WebEditor.ashx.cs # web/documentserver-example/java/src/main/java/controllers/IndexServlet.java # web/documentserver-example/java/src/main/java/entities/FileModel.java # web/documentserver-example/java/src/main/java/helpers/DocumentManager.java # web/documentserver-example/nodejs/helpers/docManager.js # web/documentserver-example/php/doceditor.php # web/documentserver-example/php/webeditor-ajax.php # web/documentserver-example/python/src/utils/docManager.py # web/documentserver-example/python/src/views/actions.py # web/documentserver-example/ruby/app/controllers/home_controller.rb # web/documentserver-example/ruby/app/models/document_helper.rb # web/documentserver-example/ruby/app/models/file_model.rb