Alexandr Fedorov 7884f3c64c Merge remote-tracking branch 'remotes/origin/develop' into feature/redesign ...

# Conflicts:
#	web/documentserver-example/nodejs/views/index.ejs
#	web/documentserver-example/python/templates/index.html

2021-03-25 21:31:22 +03:00

..

editor.html

Copyright 2021

2021-03-15 11:54:47 +03:00

index.html

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

2021-03-25 21:31:22 +03:00