pavelbannov 789ab8f956 Merge branch 'develop' into feature/refactoring-saveUserInfo ... # Conflicts: # common/ASC.Core.Common/Context/Impl/UserManager.cs # products/ASC.Files/Core/GlobalUsings.cs # products/ASC.Files/Service/Core/FilesModule.cs # products/ASC.Files/Service/Core/FoldersModule.cs # products/ASC.People/Server/Api/UserController.cs # web/ASC.Web.Core/QuotaSync.cs # web/ASC.Web.Core/Users/UserManagerWrapper.cs		2022-11-09 12:57:16 +03:00
..
AuthManager.cs	refactoring	2022-04-15 12:08:06 +03:00
AuthorizationManager.cs	added new license headers	2022-03-15 21:00:53 +03:00
CoreConfiguration.cs	removed unnecessary	2022-08-25 13:54:11 +03:00
SubscriptionManager.cs	refactor	2022-10-18 14:22:02 +03:00
TenantManager.cs	Payments: refactoring. TrialEnabled setting	2022-09-21 18:44:32 +03:00
UserManager.cs	Merge branch 'develop' into feature/refactoring-saveUserInfo	2022-11-09 12:57:16 +03:00