pavelbannov 6bad98e277 Merge branch 'master' into feature/schema ... # Conflicts: # config/appsettings.json # products/ASC.Files/Server/ASC.Files.csproj # web/ASC.Web.Studio/ASC.Web.Studio.csproj		2020-10-01 12:25:07 +03:00
..
Controllers	Files: fix	2020-09-25 13:47:21 +03:00
DocStore	Files: core. replace	2020-07-28 15:45:14 +03:00
Helpers	moved from release/11 4414f77b	2020-09-22 17:17:17 +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/schema	2020-10-01 12:25:07 +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	Merge branch 'master' into feature/schema	2020-10-01 12:25:07 +03:00