pavelbannov 3e6a417d19 Merge branch 'hotfix/v1.1.2' into develop ... # Conflicts: # common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs # migrations/mysql/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs # packages/client/src/components/panels/SelectFileDialog/index.js # packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/ButtonComponent.js # packages/client/src/pages/PortalSettings/categories/security/access-portal/tfa.js # packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js # packages/client/src/store/ProfileActionsStore.js # packages/common/api/files/index.js # packages/common/store/AuthStore.js # web/ASC.Web.Api/Api/AuthenticationController.cs # web/ASC.Web.Api/Api/Settings/SettingsController.cs # yarn.lock		2023-09-01 15:33:39 +03:00
..
includes	Nginx: fix	2019-12-11 18:36:51 +03:00
sites-enabled	Web: Removed useless for static build	2022-09-02 11:31:35 +03:00
batch.js
onlyoffice-client.conf	Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes)	2022-08-01 15:37:33 +03:00
onlyoffice-login.conf	Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes)	2022-08-01 15:37:33 +03:00
onlyoffice-story.conf
onlyoffice.conf	Merge branch 'hotfix/v1.1.2' into develop	2023-09-01 15:33:39 +03:00
proxy-frontend-virt.conf	nginx: replaced localhost with 127.0.0.1, because sometimes localhost resolved nginx as ipv6	2022-09-07 19:18:43 +03:00
proxy-frontend.conf	nginx: replaced localhost with 127.0.0.1, because sometimes localhost resolved nginx as ipv6	2022-09-07 19:18:43 +03:00