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
..
Controllers	Merge branch 'develop' into refactoring/scope	2020-11-10 11:42:50 +03:00
DocStore	Files: core. replace	2020-07-28 15:45:14 +03:00
Helpers	Merge branch 'develop' into refactoring/scope	2020-11-10 11:42:50 +03:00
Properties	Files: Startup	2020-02-12 13:48:58 +03:00
appsettings.json	Files: Startup	2020-02-12 13:48:58 +03:00
ASC.Files.csproj	Merge branch 'master' into feature/files	2020-10-16 16:57:21 +03:00
ProductEntryPoint.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
Program.cs	Autofac: fix	2020-11-02 19:27:08 +03:00
Startup.cs	Merge branch 'develop' into refactoring/scope	2020-11-10 11:42:50 +03:00