Alexandr Fedorov b94704adf8 Merge remote-tracking branch 'remotes/origin/develop' into feature/insert-image ...

# Conflicts:
#	web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
#	web/documentserver-example/csharp/DocEditor.aspx
#	web/documentserver-example/java/src/main/webapp/editor.jsp
#	web/documentserver-example/nodejs/views/editor.ejs
#	web/documentserver-example/php/doceditor.php
#	web/documentserver-example/python/templates/editor.html
#	web/documentserver-example/ruby/app/views/home/editor.html.erb

2021-01-27 17:13:14 +03:00

..

app_data

Update new file templates

2019-08-02 14:28:32 +03:00

css

php: new banner

2020-11-13 14:38:45 +03:00

js

apache

2020-09-02 12:06:52 +03:00

licenses

3rd-party license

2020-09-03 13:08:44 +03:00

3rd-Party.license

3rd-party license

2020-09-03 13:08:44 +03:00

ajax.php

apache

2020-09-02 12:06:52 +03:00

common.php

Merge branch 'hotfix/apache' into develop

2020-09-04 09:59:10 +03:00

config.php

php: add fb2 to ConverExtList

2020-11-19 16:45:10 +03:00

doceditor.php

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

2021-01-27 17:13:14 +03:00

favicon.ico

changed favicon

2019-11-06 10:29:09 +03:00

functions.php

apache

2020-09-02 12:06:52 +03:00

index.php

Merge branch 'develop' into feature/new-banner

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

jwtmanager.php

apache

2020-09-02 12:06:52 +03:00

LICENSE

apache

2020-09-02 12:06:52 +03:00

web.config

php: pure php config

2018-08-30 14:27:10 +03:00

webeditor-ajax.php

apache

2020-09-02 12:06:52 +03:00