IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
aed1bf7e56
DocSpace-client/common/ASC.Core.Common/EF/Model/Resource
History
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
..
ResAuthors.cs rename Postgre to PostgreSql 2021-10-12 13:23:20 +03:00
ResAuthorsFile.cs rename Postgre to PostgreSql 2021-10-12 13:23:20 +03:00
ResAuthorsLang.cs rename Postgre to PostgreSql 2021-10-12 13:23:20 +03:00
ResCultures.cs rename Postgre to PostgreSql 2021-10-12 13:23:20 +03:00
ResData.cs rename Postgre to PostgreSql 2021-10-12 13:23:20 +03:00
ResFiles.cs rename Postgre to PostgreSql 2021-10-12 13:23:20 +03:00
ResReserve.cs Merge branch 'develop' into feature/net6 2021-11-23 16:40:50 +03:00