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
..
Billing	Merge branch 'master' into feature/files	2020-10-08 19:01:09 +03:00
Caching	Common, Core.Common moved from release/11 4414f77b	2020-09-15 16:11:05 +03:00
Configuration	Merge branch 'master' into feature/release-11.0.0	2020-09-23 14:00:24 +03:00
Context	Merge branch 'master' into feature/release-11.0.0	2020-09-20 20:17:12 +03:00
Core	Common, Core.Common moved from release/11 4414f77b	2020-09-15 16:11:05 +03:00
Data	User: fix SetUserPasswordHash	2020-09-30 15:54:36 +03:00
EF	Merge branch 'master' into feature/files	2020-10-08 19:01:09 +03:00
Migrations	Merge branch 'master' into feature/files	2020-10-08 19:01:09 +03:00
Notify	Telegram: fix Kafka	2020-09-25 14:13:43 +03:00
Properties	Code Cleanup	2019-08-15 15:04:42 +03:00
protos	Telegram: fix Kafka	2020-09-25 14:13:43 +03:00
Security	Fix confirm	2020-10-07 13:45:53 +03:00
Settings	DI: refactoring	2020-07-17 13:52:28 +03:00
Tenants	Merge branch 'master' into feature/schema	2020-10-01 12:25:07 +03:00
Tests	Common, Core.Common moved from release/11 4414f77b	2020-09-15 16:11:05 +03:00
Users	moved from release/11 4414f77b	2020-09-18 10:59:23 +03:00
WhiteLabel	moved from release/11 4414f77b	2020-09-18 10:59:23 +03:00
ASC.Core.Common.csproj	Merge branch 'master' into feature/schema	2020-10-01 12:25:07 +03:00
BaseCommonLinkUtility.cs	moved from release/11 4414f77b	2020-09-18 10:59:23 +03:00
GeolocationHelper.cs	private: firtst version	2020-08-12 12:58:08 +03:00
HostedSolution.cs	DI: refactoring	2020-10-08 11:36:47 +03:00
MultiRegionHostedSolution.cs	Merge branch 'master' into feature/schema	2020-10-01 12:25:07 +03:00