pavelbannov 6bad98e277 Merge branch 'master' into feature/schema ... # Conflicts: # config/appsettings.json # products/ASC.Files/Server/ASC.Files.csproj # web/ASC.Web.Studio/ASC.Web.Studio.csproj		2020-10-01 12:25:07 +03:00
..
DbGroup.cs	fix models for npgsql	2020-09-29 20:09:39 +03:00
User.cs	fix models for npgsql	2020-09-29 20:09:39 +03:00
UserGroup.cs	EF: fix	2020-09-20 23:02:34 +03:00
UserPhoto.cs	changed	2020-09-07 01:49:03 +03:00
UserSecurity.cs	Merge branch 'master' into feature/schema	2020-10-01 12:25:07 +03:00