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
..
Controllers	Merge branch 'feature/remove-wq' of github.com:ONLYOFFICE/AppServer into feature/remove-wq	2021-05-13 11:57:40 +03:00
Core	Auth by thirdparty	2021-02-19 19:16:08 +03:00
Models	Merge branch 'develop' into bugfix/thirdparty	2021-04-27 11:25:30 +03:00
Properties	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
appsettings.json	External config	2019-06-21 11:03:42 +03:00
ASC.Web.Api.csproj	add support WindowsService/systemd for IHostBuilder	2021-04-23 16:54:39 +03:00
ASC.Web.Api.sln	init commit	2019-05-15 17:56:09 +03:00
Program.cs	add support WindowsService/systemd for IHostBuilder	2021-04-23 16:54:39 +03:00
Startup.cs	Fixed loading products, lazy loading webitemmanager	2021-01-26 12:29:50 +03:00