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
..
Models	moved from ddf515b8	2022-06-05 18:44:37 +03:00
Providers	Merge branch 'develop' into feature/refactoring-saveUserInfo	2022-11-09 12:57:16 +03:00
AbstractMigration.cs	moved from ddf515b8	2022-06-05 18:44:37 +03:00
IMigration.cs	moved from ddf515b8	2022-06-05 18:44:37 +03:00
ImportableEntity.cs	async UpdateUserInfo and SaveUserInfo	2022-10-25 18:27:56 +03:00
MigrationLogger.cs	moved from ddf515b8	2022-06-16 11:13:53 +03:00
OngoingMigration.cs	moved from ddf515b8	2022-06-05 18:44:37 +03:00