pavelbannov 5a5e299d98 Merge branch 'develop' into feature/webhooks ... # Conflicts: # ASC.Web.sln # common/ASC.Api.Core/Core/BaseStartup.cs # common/services/ASC.Data.Backup/ASC.Data.Backup.csproj # web/ASC.Web.Api/ASC.Web.Api.csproj		2021-10-19 18:30:59 +03:00
..
Caching	fix Bug 50254	2021-10-05 22:28:07 +03:00
Collections	Optimization	2019-08-30 15:40:57 +03:00
Data	Storage: moved from 08a01422	2021-05-21 16:26:42 +03:00
DependencyInjection	replace Path.Combine to CrossPlatform.PathCombine	2021-04-16 16:26:26 +03:00
Geolocation	EF: GeolocationHelper	2019-12-13 16:05:24 +03:00
Logging	Nlog: optimization	2021-08-20 15:42:43 +03:00
Mapping	crm: refactoring. bugfix	2021-05-05 17:09:05 +03:00
Module	init commit	2019-05-15 17:56:09 +03:00
Notify	Optimization	2019-08-08 12:26:58 +03:00
Properties	Code Cleanup	2019-08-15 15:04:42 +03:00
protos	Merge branch 'develop' into feature/remove-wq	2021-05-13 11:23:44 +03:00
Security	Scope: refactoring	2020-10-19 18:53:15 +03:00
Threading	Backup: fix	2021-05-19 11:31:50 +03:00
Utils	Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar	2021-07-27 12:43:01 +03:00
Web	Common, Core.Common moved from release/11 4414f77b	2020-09-15 16:11:05 +03:00
ASC.Common.csproj	Merge branch 'develop' into feature/webhooks	2021-08-26 15:17:53 +03:00
ASC.Common.sln	init commit	2019-05-15 17:56:09 +03:00
DIHelper.cs	Merge branch 'develop' into feature/remove-wq	2021-05-13 11:23:44 +03:00