Sergey Linnik c0051304d9 Merge remote-tracking branch 'remotes/origin/develop' into feature/select-word ...

# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
#	web/documentserver-example/csharp/DocEditor.aspx
#	web/documentserver-example/csharp/DocEditor.aspx.cs
#	web/documentserver-example/java-spring/src/main/resources/templates/editor.html
#	web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
#	web/documentserver-example/java/src/main/webapp/editor.jsp
#	web/documentserver-example/php/src/views/DocEditorView.php
#	web/documentserver-example/php/templates/docEditor.tpl
#	web/documentserver-example/python/src/views/actions.py
#	web/documentserver-example/python/templates/editor.html
#	web/documentserver-example/ruby/app/views/home/editor.html.erb

2023-10-12 11:54:43 +03:00

..

editor.html

Merge remote-tracking branch 'remotes/origin/develop' into feature/select-word

2023-10-12 11:54:43 +03:00

index.html

python: jquery-3.6.4 instead of 1.9.0

2023-03-17 13:46:46 +03:00