Merge remote-tracking branch 'remotes/origin/develop' into feature/config-refactor

# Conflicts:
#	web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
#	web/documentserver-example/python/src/views/actions.py
#	web/documentserver-example/ruby/config/application.rb
This commit is contained in:
Alexandr Fedorov
2021-01-29 12:49:30 +03:00
56 changed files with 653 additions and 37 deletions

View File

@ -37,7 +37,11 @@
<%: Styles.Render("~/Content/css") %>
</head>
<body>
<div class="top-panel"></div>
<div class="top-panel">
<a href="">
<img src ="content/images/logo.svg" alt="ONLYOFFICE" />
</a>
</div>
<div class="main-panel">
<span class="portal-name">ONLYOFFICE Document Editors</span>
<br />