Vladislav Makhov 3578340bcd Merge branch 'feature/files' into feature/files-recent ... # Conflicts: # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js # products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js		2020-10-16 17:15:14 +03:00
..
ASC.Files	Merge branch 'feature/files' into feature/files-recent	2020-10-16 17:15:14 +03:00
ASC.People	Web: People: Fixed the error of returning to the list of users immediately after refreshing the page and switching to the profile view	2020-10-16 14:54:13 +03:00