pavelbannov 3ca0990715 Merge branch 'master' into feature/files ... # Conflicts: # common/ASC.Core.Common/EF/Model/FilesConverts.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs		2020-10-08 19:01:09 +03:00
..
Audit	EF: rename	2020-10-08 12:07:05 +03:00
Core	EF: rename	2020-10-08 12:07:05 +03:00
CRM	EF: rename	2020-10-08 12:07:05 +03:00
Feed	EF: rename	2020-10-08 12:07:05 +03:00
Mail	EF: rename	2020-10-08 12:07:05 +03:00
Notify	EF: rename	2020-10-08 12:07:05 +03:00
Resource	EF: rename	2020-10-08 12:07:05 +03:00
Tenant	EF: rename	2020-10-08 12:07:05 +03:00
User	EF: rename	2020-10-08 12:07:05 +03:00
AccountLinks.cs	EF: rename	2020-10-08 12:07:05 +03:00
DbipLocation.cs	EF: rename	2020-10-08 12:07:05 +03:00
DbWebstudioIndex.cs	EF: rename	2020-10-08 12:07:05 +03:00
DbWebstudioSettings.cs	Merge branch 'master' into feature/files	2020-10-08 19:01:09 +03:00
DbWebstudioUservisit.cs	EF: rename	2020-10-08 12:07:05 +03:00
FilesConverts.cs	Merge branch 'master' into feature/files	2020-10-08 19:01:09 +03:00
MobileAppInstall.cs	EF: rename	2020-10-08 12:07:05 +03:00
ModelBuilderWrapper.cs	EF: refactoring	2020-10-05 13:02:28 +03:00
Regions.cs	EF: table renamed	2019-12-23 15:41:43 +03:00
TelegramUser.cs	EF: rename	2020-10-08 12:07:05 +03:00