Alexandr Fedorov f8f15d2191 Merge remote-tracking branch 'remotes/origin/develop' into feature/get-files ...

# Conflicts:
#	web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
#	web/documentserver-example/csharp/WebEditor.ashx.cs
#	web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
#	web/documentserver-example/php/webeditor-ajax.php
#	web/documentserver-example/python/src/urls.py
#	web/documentserver-example/python/src/views/actions.py
#	web/documentserver-example/ruby/app/controllers/home_controller.rb
#	web/documentserver-example/ruby/config/routes.rb

2021-02-02 22:12:21 +03:00

..

Home

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

2021-02-02 22:12:21 +03:00

Shared

fixed license comment 8050ec572a

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

Web.config

Document Service Integration

2016-03-23 12:55:12 +03:00