pavelbannov 2782d9f64c Merge branch 'master' into feature/ef ... # Conflicts: # common/ASC.VoipService/Dao/CachedVoipDao.cs # common/ASC.VoipService/Dao/VoipDao.cs # web/ASC.Web.Api/Controllers/SettingsController.cs		2019-12-23 16:25:33 +03:00
..
ASC.Api.Core	Merge branch 'master' into feature/ef	2019-12-06 12:25:18 +03:00
ASC.Common	Merge branch 'master' into feature/ef	2019-12-23 16:25:33 +03:00
ASC.Core.Common	Merge branch 'master' into feature/ef	2019-12-23 16:25:33 +03:00
ASC.Data.Reassigns	.net core up to 3.1	2019-12-06 12:12:51 +03:00
ASC.Data.Storage	Consumers: added config	2019-12-20 14:17:01 +03:00
ASC.FederatedLogin	Merge branch 'master' into feature/ef	2019-12-23 16:25:33 +03:00
ASC.Feed	EF: AddOrUpdate	2019-12-17 16:01:59 +03:00
ASC.IPSecurity	EF: ipRestriction	2019-12-10 17:47:48 +03:00
ASC.MessagingSystem	EF: AuditEvent. fix Remove Old Event	2019-12-18 15:24:22 +03:00
ASC.Notify.Textile	.net core up to 3.1	2019-12-06 12:12:51 +03:00
ASC.Resource.Manager	EF: resourceManager	2019-12-16 12:30:01 +03:00
ASC.Textile	DI: configuration	2019-09-23 15:20:08 +03:00
ASC.VoipService	Merge branch 'master' into feature/ef	2019-12-23 16:25:33 +03:00
services	Merge branch 'master' into feature/ef	2019-12-23 16:25:33 +03:00