pavelbannov 6bad98e277 Merge branch 'master' into feature/schema ... # Conflicts: # config/appsettings.json # products/ASC.Files/Server/ASC.Files.csproj # web/ASC.Web.Studio/ASC.Web.Studio.csproj		2020-10-01 12:25:07 +03:00
..
Helpers	fix	2020-08-27 17:01:37 +03:00
LoginProviders	Telegram: fix Kafka	2020-09-25 14:13:43 +03:00
Profile	fix	2020-08-27 17:01:37 +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	choice between mysql and postgresql	2020-08-28 00:45:07 +03:00
ASC.FederatedLogin.csproj	References updated	2020-06-28 16:55:21 +03:00
callback.htm	ASC.FederatedLogin: .netcoreapp3.0	2019-06-06 16:34:46 +03:00
Login.cs	private: firtst version	2020-08-12 12:58:08 +03:00
LoginMode.cs	ASC.FederatedLogin: .netcoreapp3.0	2019-06-06 16:34:46 +03:00
MultiRegionAccountLinker.cs	fix	2020-08-27 17:01:37 +03:00
OAuth20Token.cs	fix	2020-08-27 17:01:37 +03:00
ProviderConstants.cs	moved from release/11 4414f77b	2020-09-18 10:59:23 +03:00