gopienkonikita c7c9225923 Merge branch 'develop' into feature/thirdparty-integrations ... # Conflicts: # products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js # products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js # products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js # products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json # products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json # products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js # products/ASC.Files/Client/src/store/files/selectors.js		2021-01-11 12:37:31 +03:00
..
Controllers	Merge branch 'develop' into feature/thirdparty-integrations	2021-01-11 12:37:31 +03:00
Core	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
Models	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
Properties	Common nlog config	2019-11-15 11:47:56 +03:00
appsettings.json	External config	2019-06-21 11:03:42 +03:00
ASC.Web.Api.csproj	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
ASC.Web.Api.sln	init commit	2019-05-15 17:56:09 +03:00
Program.cs	fix create file	2020-11-26 20:30:57 +03:00
Startup.cs	Merge branch 'develop' into refactoring/scope	2020-11-13 16:03:17 +03:00