pengjunjie/document-server-integration
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/document-server-integration.git synced 2026-04-07 14:06:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	web/documentserver-example/nodejs/views/index.ejs
#	web/documentserver-example/python/templates/index.html
This commit is contained in:
Alexandr Fedorov
2021-03-25 21:31:22 +03:00
parent 4f2d7f0a3f f54e505aad
commit 7884f3c64c
116 changed files with 226 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
View File

@ -13,7 +13,7 @@
<meta name="viewport" content="width=device-width" />
<!--
*
* (c) Copyright Ascensio System SIA 2020
* (c) Copyright Ascensio System SIA 2021
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.