pavelbannov 68483bc979 Merge branch 'develop' into refactoring/scope ... # Conflicts: # common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs # web/ASC.Web.Api/Controllers/PortalController.cs # web/ASC.Web.Api/Startup.cs		2020-11-13 16:03:17 +03:00
..
Client	Update yarn.lock files	2020-11-11 22:03:47 +03:00
Server	Merge branch 'develop' into refactoring/scope	2020-11-13 16:03:17 +03:00