pavelbannov 1490332568 Merge branch 'develop' into refactoring/scope ... # Conflicts: # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs # products/ASC.Files/Core/Helpers/WordpressHelper.cs # products/ASC.Files/Server/Controllers/PrivacyRoomController.cs # products/ASC.Files/Server/Startup.cs		2020-11-10 11:42:50 +03:00
..
Billing	Refactoring: scope	2020-10-22 20:57:18 +03:00
Caching	Refactoring: scope	2020-10-22 20:57:18 +03:00
Configuration	Scope: refactoring	2020-10-19 18:53:15 +03:00
Context	Merge branch 'develop' into refactoring/scope	2020-11-10 11:42:50 +03:00
Core	Scope: refactoring	2020-10-19 18:53:15 +03:00
Data	Refactoring: scope	2020-10-22 20:57:18 +03:00
EF	DI: fix	2020-10-28 23:02:03 +03:00
Migrations	Merge branch 'master' into feature/files	2020-10-13 12:52:28 +03:00
Notify	Merge branch 'develop' into refactoring/scope	2020-11-10 11:42:50 +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	Scope: refactoring	2020-10-20 16:24:46 +03:00
Settings	Scope: refactoring	2020-10-19 18:53:15 +03:00
Tenants	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
Tests	Scope: refactoring	2020-10-19 18:53:15 +03:00
Users	Refactoring: scope	2020-10-20 23:10:17 +03:00
WhiteLabel	Scope: refactoring	2020-10-19 18:53:15 +03:00
ASC.Core.Common.csproj	Removed sq bugs and code smells	2020-10-16 16:21:59 +03:00
BaseCommonLinkUtility.cs	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
GeolocationHelper.cs	private: firtst version	2020-08-12 12:58:08 +03:00
HostedSolution.cs	Refactoring: scope	2020-10-20 23:10:17 +03:00
MultiRegionHostedSolution.cs	Merge branch 'master' into feature/schema	2020-10-01 12:25:07 +03:00