pavelbannov 8ca88e4620 Merge branch 'develop' into feature/net6 ... # Conflicts: # common/ASC.Api.Core/Core/BaseStartup.cs # common/ASC.Common/ASC.Common.csproj # products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj # products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs # products/ASC.Files/Server/ASC.Files.csproj # web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj		2021-11-23 16:40:50 +03:00
..
DbGroup.cs	rename Postgre to PostgreSql	2021-10-12 13:23:20 +03:00
User.cs	rename Postgre to PostgreSql	2021-10-12 13:23:20 +03:00
UserGroup.cs	rename Postgre to PostgreSql	2021-10-12 13:23:20 +03:00
UserPhoto.cs	Merge branch 'develop' into feature/net6	2021-11-23 16:40:50 +03:00
UserSecurity.cs	Merge branch 'develop' into feature/auto-migrations	2021-10-25 20:52:13 +03:00