pavelbannov f00a964c32 Merge branch 'master' into feature/private ... # Conflicts: # common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs # web/ASC.Web.Api/Controllers/SettingsController.cs		2020-08-14 17:19:36 +03:00
..
Controllers	Merge branch 'master' into feature/private	2020-08-14 17:19:36 +03:00
DocStore	Files: core. replace	2020-07-28 15:45:14 +03:00
Helpers	Merge branch 'master' into feature/private	2020-08-14 17:19:36 +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	Thirdparty: remove reference	2020-08-14 16:16:48 +03:00
ProductEntryPoint.cs	DI: refactoring	2020-07-17 13:52:28 +03:00
Program.cs	Startup: added command line	2020-06-04 16:26:31 +03:00
Startup.cs	DI: files fix	2020-07-16 12:08:20 +03:00