pavelbannov d01db1eed6 Merge branch 'feature/remove-wq' of github.com:ONLYOFFICE/AppServer into feature/remove-wq ... # Conflicts: # common/ASC.Data.Storage/Encryption/EncryptionOperation.cs # common/ASC.Data.Storage/Encryption/EncryptionServiceNotifier.cs # common/ASC.Data.Storage/Encryption/EncryptionWorker.cs # common/ASC.Data.Storage/StaticUploader.cs # common/services/ASC.Data.Backup/BackupAjaxHandler.cs # common/services/ASC.Data.Backup/Service/BackupService.cs # web/ASC.Web.Api/Controllers/SettingsController.cs		2021-05-13 11:57:40 +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	revert discard	2020-10-12 22:39:23 +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
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
Tests	revert discard	2020-10-12 22:39:23 +03:00
Threading	Merge branch 'feature/remove-wq' of github.com:ONLYOFFICE/AppServer into feature/remove-wq	2021-05-13 11:57:40 +03:00
Utils	replace Path.Combine to CrossPlatform.PathCombine	2021-04-16 16:26:26 +03:00
Web	Common, Core.Common moved from release/11 4414f77b	2020-09-15 16:11:05 +03:00
ASC.Common.csproj	Common: added assembly version	2021-04-09 11:12:10 +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