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
..
FilesController.cs	Merge branch 'develop' into refactoring/scope	2020-11-13 16:03:17 +03:00
PrivacyRoomController.cs	Merge branch 'develop' into feature/desktop-view	2020-11-30 15:16:49 +03:00