pavelbannov 7f1d946269 Merge branch 'develop' into feature/stripe ... # Conflicts: # packages/client/src/Shell.jsx # packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js # packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js # packages/client/src/pages/PortalSettings/index.js # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.People/Server/Api/UserController.cs # products/ASC.People/Server/GlobalUsings.cs # web/ASC.Web.Core/HttpHandlers/SsoHandler.cs		2022-09-23 16:11:23 +03:00
..
20220725110944_FilesDbContextMigrate.cs	Files: quota* tables removed from filesDbContext	2022-08-23 12:57:20 +03:00
20220725110944_FilesDbContextMigrate.Designer.cs	Files: quota* tables removed from filesDbContext	2022-08-23 12:57:20 +03:00
20220825073139_FilesDbContext_Upgrade1.cs	FilesDbContext: upgrade	2022-08-25 10:36:27 +03:00
20220825073139_FilesDbContext_Upgrade1.Designer.cs	FilesDbContext: upgrade	2022-08-25 10:36:27 +03:00
20220908145301_FilesDbContext_Upgrade2.cs	Files: added subject type, files link options	2022-09-08 18:05:33 +03:00
20220908145301_FilesDbContext_Upgrade2.Designer.cs	Files: added subject type, files link options	2022-09-08 18:05:33 +03:00
FilesDbContextModelSnapshot.cs	Merge branch 'develop' into feature/stripe	2022-09-23 16:11:23 +03:00