pavelbannov d864448da5 Merge branch 'hotfix/v1.1.2' into develop ... # Conflicts: # products/ASC.Files/Core/Core/VirtualRooms/InvitationLinkService.cs # products/ASC.Files/Core/Utils/FileSharing.cs # products/ASC.People/Server/Api/UserController.cs # web/ASC.Web.Api/Api/PortalController.cs		2023-09-04 23:01:50 +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	Nginx: batch.json	2019-09-10 16:07:39 +03:00
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	Nginx: storybook	2019-07-15 16:57:53 +03:00
onlyoffice.conf	Merge branch 'hotfix/v1.1.2' into develop	2023-09-04 23:01:50 +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