Sergey Linnik aa1b712131 Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions ... # Conflicts: # products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs # products/ASC.Files/Server/Api/FoldersController.cs # products/ASC.Files/Server/Api/SettingsController.cs # products/ASC.Files/Server/Api/VirtualRoomsController.cs # web/ASC.Web.Api/Api/AuthenticationController.cs # web/ASC.Web.Api/Api/PortalController.cs # web/ASC.Web.Api/Api/SecurityController.cs # web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs # web/ASC.Web.Api/Api/Settings/WebhooksController.cs # web/ASC.Web.Api/Api/Settings/WhitelabelController.cs		2023-03-29 19:28:15 +05:00
..
ASC.Files	Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions	2023-03-29 19:28:15 +05:00
ASC.People/Server	invitation link: added tariff/quota/permissions check, refactoring	2023-03-23 16:22:01 +03:00