pavelbannov a085e8ef38 Merge branch 'master' into feature/release-11.0.0 ... # Conflicts: # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Core/Utility/TenantExtra.cs		2020-09-23 14:00:24 +03:00
..
AmazonS3Settings.cs	init commit	2019-05-15 17:56:09 +03:00
AmiPublicDnsSyncService.cs	Sln: removed *_Ubuntu configuration	2020-09-04 12:06:30 +03:00
ConnectionStringNameTypeConverter.cs	DI: configuration	2019-10-10 11:52:21 +03:00
Constants.cs	Common, Core.Common moved from release/11 4414f77b	2020-09-15 16:11:05 +03:00
Consumer.cs	Api: fix	2020-09-23 13:55:39 +03:00
SmtpSettings.cs	IDE0016	2019-08-15 16:20:23 +03:00