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
..
Audit	fix models for npgsql	2020-09-29 20:09:39 +03:00
Core	Merge branch 'master' into feature/schema	2020-10-01 12:25:07 +03:00
CRM	fix models for npgsql	2020-09-29 20:09:39 +03:00
Feed	fix models for npgsql	2020-09-29 20:09:39 +03:00
Mail	fix models for npgsql	2020-09-29 20:09:39 +03:00
Notify	Merge branch 'master' into feature/schema	2020-10-01 12:25:07 +03:00
Resource	fix models for npgsql	2020-09-29 20:09:39 +03:00
Tenant	fix models for npgsql	2020-09-29 20:09:39 +03:00
User	Merge branch 'master' into feature/schema	2020-10-01 12:25:07 +03:00
AccountLinks.cs	fix models for npgsql	2020-09-29 20:09:39 +03:00
DbipLocation.cs	fix models for npgsql	2020-09-29 20:09:39 +03:00
DbWebstudioIndex.cs	changed	2020-09-07 01:49:03 +03:00
DbWebstudioSettings.cs	Added Data	2020-09-18 20:50:30 +03:00
DbWebstudioUservisit.cs	changed	2020-09-07 01:49:03 +03:00
FilesConverts.cs	fix models for npgsql	2020-09-29 20:09:39 +03:00
MobileAppInstall.cs	changed	2020-09-07 01:49:03 +03:00
ModelBuilderWrapper.cs	EF: refactoring	2020-09-02 18:23:39 +03:00
Regions.cs	EF: table renamed	2019-12-23 15:41:43 +03:00
TelegramUser.cs	Common, Core.Common moved from release/11 4414f77b	2020-09-15 16:11:05 +03:00