Sergey Linnik 382160f2fc Merge remote-tracking branch 'remotes/origin/release/v7.1.0' into develop ...

# Conflicts:
#	web/documentserver-example/csharp-mvc/assets
#	web/documentserver-example/csharp/assets
#	web/documentserver-example/java-spring/src/main/resources/assets
#	web/documentserver-example/java/src/main/resources/assets
#	web/documentserver-example/nodejs/public/assets
#	web/documentserver-example/php/assets
#	web/documentserver-example/python/assets
#	web/documentserver-example/ruby/public/assets

2022-02-09 10:05:10 +03:00

..

assets

ruby: fix bug of displaying the editor

2022-01-10 12:30:28 +03:00

controllers

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

2021-11-18 12:54:57 +03:00

helpers

Copyright 2021

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

mailers

Document Service Integration

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

models

Merge remote-tracking branch 'remotes/origin/release/v7.1.0' into develop

2022-02-09 10:05:10 +03:00

views

Merge pull request #233 from ONLYOFFICE/feature/pptx-xpath

2021-12-13 16:16:54 +03:00