gopienkonikita 0231e60cc7 Merge branch 'master' into feature/files ... # Conflicts: # web/ASC.Web.Components/package.json # web/ASC.Web.Components/src/components/icons/svg/index.js # web/ASC.Web.Components/src/index.js		2020-07-28 17:34:46 +03:00
..
Controllers	Merge branch 'master' into feature/files	2020-07-13 16:46:42 +03:00
DocStore	Files: core. replace	2020-07-28 15:45:14 +03:00
Helpers	Merge branch 'master' into feature/files	2020-07-17 17:48:50 +03:00
Model	Merge branch 'master' into feature/files	2020-07-16 14:41:32 +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-07-28 17:34:46 +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/files	2020-07-16 14:41:32 +03:00