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
..
Helpers	Consumers: added config	2019-12-20 14:17:01 +03:00
LoginProviders	DI: little twitter fix	2019-12-20 16:07:27 +03:00
Profile	DI: Configuration	2019-10-09 18:04:46 +03:00
Properties	added ASC.VoipService	2019-06-06 17:41:16 +03:00
protos	Replaced ICacheNotify with ICacheNotify<>	2019-07-22 15:31:09 +03:00
AccountLinker.cs	EF: AddOrUpdate	2019-12-17 16:01:59 +03:00
ASC.FederatedLogin.csproj	.net core up to 3.1	2019-12-06 12:12:51 +03:00
callback.htm	ASC.FederatedLogin: .netcoreapp3.0	2019-06-06 16:34:46 +03:00
Login.cs	Consumers: added config	2019-12-20 14:17:01 +03:00
LoginMode.cs	ASC.FederatedLogin: .netcoreapp3.0	2019-06-06 16:34:46 +03:00
MultiRegionAccountLinker.cs	DI: AccountLinker	2019-12-04 13:39:18 +03:00
OAuth20Token.cs	IDE0018	2019-08-15 16:05:50 +03:00
ProviderConstants.cs	ASC.FederatedLogin: .netcoreapp3.0	2019-06-06 16:34:46 +03:00