pavelbannov 86e635cd51 Merge branch 'develop' into feature/backup-s3-tar ... # Conflicts: # common/ASC.Data.Storage/S3/S3Storage.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs		2023-08-29 14:31:16 +03:00
..
AmazonS3Settings.cs	added new license headers	2022-03-15 21:00:53 +03:00
Constants.cs	added new license headers	2022-03-15 21:00:53 +03:00
Consumer.cs	fix s3 backup tar	2023-07-19 00:19:27 +03:00
SmtpSettings.cs	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00