Alexandr Fedorov dae246e8a2 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

2021-01-29 12:49:30 +03:00

..

config.ejs

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

2021-01-29 12:49:30 +03:00

editor.ejs

nodejs: fix merge

2021-01-28 15:29:14 +03:00

error.ejs

fixed license comment 8050ec572a

2020-11-10 17:10:43 +03:00

index.ejs

Merge branch 'develop' into feature/new-banner

2021-01-26 16:06:46 +03:00