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

# Conflicts:
#	web/documentserver-example/java-spring/src/main/resources/templates/editor.html
This commit is contained in:
Sergey Linnik
2025-02-10 10:42:44 +03:00

View File

@ -23,7 +23,7 @@
* *
--> -->
<title>[[${model.getDocument().getTitle()}]] - ONLYOFFICE</title> <title>[[${model.getDocument().getTitle()}]] - ONLYOFFICE</title>
<link rel="icon" th:href="@{/css/img/{icon}.ico(icon=${model.getDocumentType()})}" type="image/x-icon"/> <link rel="icon" th:href="@{/css/img/{icon}.ico(icon=${model.getDocumentType().toString().toLowerCase()})}" type="image/x-icon"/>
<link rel="stylesheet" type="text/css" href="css/editor.css" /> <link rel="stylesheet" type="text/css" href="css/editor.css" />
<script type="text/javascript" th:src="@{${docserviceApiUrl}}"></script> <script type="text/javascript" th:src="@{${docserviceApiUrl}}"></script>