pavelbannov 1490332568 Merge branch 'develop' into refactoring/scope ... # Conflicts: # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs # products/ASC.Files/Core/Helpers/WordpressHelper.cs # products/ASC.Files/Server/Controllers/PrivacyRoomController.cs # products/ASC.Files/Server/Startup.cs		2020-11-10 11:42:50 +03:00
..
AuthManager.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
AuthorizationManager.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
CoreConfiguration.cs	Refactoring: scope	2020-10-19 22:04:07 +03:00
PaymentManager.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
SubscriptionManager.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
TenantManager.cs	Merge branch 'develop' into refactoring/scope	2020-11-10 11:42:50 +03:00
UserManager.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00