TatianaLopaeva ae17671043 Merge branch 'develop' into feature/backup ... # Conflicts: # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Settings.json # web/ASC.Web.Client/src/store/SettingsSetupStore.js		2021-06-18 18:08:38 +03:00
..
Caching	Files: removed temp	2021-01-13 12:41:29 +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	replace Path.Combine to CrossPlatform.PathCombine	2021-04-16 16:26:26 +03:00
Mapping	crm: refactoring. bugfix	2021-05-05 17:09:05 +03:00
Module
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	bug fix: DistributedTask.Exception clean up when OnCompleted	2021-06-16 17:24:48 +03:00
Utils	Common, db: moved from 08a01422	2021-05-17 14:35:00 +03:00
Web	Common, Core.Common moved from release/11 4414f77b	2020-09-15 16:11:05 +03:00
ASC.Common.csproj	Merge pull request #245 from ONLYOFFICE/feature/crm-migrate	2021-06-16 17:02:46 +03:00
ASC.Common.sln
DIHelper.cs	Merge branch 'develop' into feature/remove-wq	2021-05-13 11:23:44 +03:00