Vladislav Makhov b748693676 Merge branch 'develop' into feature/desktop-view ... # Conflicts: # products/ASC.Files/Client/src/App.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/Header/index.js # products/ASC.Files/Client/src/components/panels/SharingPanel/index.js # web/ASC.Web.Common/src/components/PageLayout/sub-components/section-body.js # web/ASC.Web.Common/src/pages/login/index.js # web/ASC.Web.Components/src/components/row/index.js		2020-12-15 11:00:54 +03:00
..
FilesController.cs	Web: Files: Fixed opening file on external link	2020-12-10 19:15:36 +03:00
PrivacyRoomController.cs	Merge branch 'develop' into feature/desktop-view	2020-11-30 15:16:49 +03:00