Merge remote-tracking branch 'remotes/origin/develop' into feature/change-files-folder

# Conflicts:
#	web/documentserver-example/csharp-mvc/web.appsettings.config
#	web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
This commit is contained in:
Sergey Linnik
2021-11-18 12:54:57 +03:00
102 changed files with 1216 additions and 218 deletions

View File

@ -157,6 +157,10 @@ label .checkbox {
background-image: url("images/file_pptx.svg");
}
.try-editor.form {
background-image: url("images/file_docxf.svg");
}
.create-sample {
color: #666666;
line-height: 24px;