Sergey Linnik 828115e5b0 Merge remote-tracking branch 'remotes/origin/develop' into feature/change-files-folder ...

# Conflicts:
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/storage/LocalFileStorage.java

2021-12-13 15:38:37 +03:00

..

environments

Document Service Integration

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

initializers

ruby: fix embedded mode; fix media.css connect

2021-11-02 18:13:45 +03:00

locales

Document Service Integration

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

application.rb

1.1.0

2021-12-13 11:34:05 +03:00

boot.rb

Document Service Integration

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

database.yml

Document Service Integration

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

environment.rb

Document Service Integration

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

routes.rb

ruby: add Copy File as...

2021-11-15 16:02:11 +03:00

secrets.yml

Document Service Integration

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