pavelbannov 545bacfaf0 Merge branch 'develop' into fix-conflicts-merge ... # Conflicts: # packages/client/src/pages/VersionHistory/Section/Body/index.js # products/ASC.Files/Core/Configuration/FilesSettings.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/Core/Security/FileSecurity.cs # products/ASC.Files/Core/Core/Security/FileShareOptions.cs # products/ASC.Files/Server/Api/FoldersController.cs # web/ASC.Web.Api/Api/Settings/SettingsController.cs		2023-07-21 16:51:49 +03:00
..
S3Storage.cs	Merge branch 'develop' into fix-conflicts-merge	2023-07-21 16:51:49 +03:00
UnencodedUri.cs	added new license headers	2022-03-15 21:00:53 +03:00