Tatiana Lopaeva 7b623c4e30 Merge branch 'develop' into feature/stripe ... # Conflicts: # packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js # packages/client/src/pages/PortalSettings/utils/settingsTree.js # packages/common/store/AuthStore.js # packages/components/slider/index.js # web/ASC.Web.Api/Api/Settings/SettingsController.cs		2022-09-05 10:19:52 +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
FilesDbContextModelSnapshot.cs	Merge branch 'develop' into feature/stripe	2022-09-05 10:19:52 +03:00