442a6bb30a
# Conflicts: # config/nginx/onlyoffice.conf # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Studio/Startup.cs |
||
---|---|---|
.. | ||
includes | ||
sites-enabled | ||
batch.js | ||
onlyoffice-files-editor.conf | ||
onlyoffice-files.conf | ||
onlyoffice-login.conf | ||
onlyoffice-people.conf | ||
onlyoffice-story.conf | ||
onlyoffice-studio.conf | ||
onlyoffice.conf | ||
proxy-frontend-virt.conf | ||
proxy-frontend.conf |