Vladislav Makhov 813c9c4b1d Merge branch 'develop' into feature/desktop-view ... # Conflicts: # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js # web/ASC.Web.Common/src/components/NavMenu/index.js # web/ASC.Web.Common/src/pages/login/index.js # web/ASC.Web.Common/src/store/auth/actions.js		2020-11-30 15:16:49 +03:00
..
Controllers	Merge branch 'develop' into feature/desktop-view	2020-11-30 15:16:49 +03:00
DocStore	Files: core. replace	2020-07-28 15:45:14 +03:00
Helpers	Merge branch 'develop' into refactoring/scope	2020-11-13 16:03: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	Files: removed dependencies	2020-11-16 21:30:33 +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