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
..
images	Merge branch 'develop' into feature/thirdparty-integrations	2021-01-11 12:37:31 +03:00
favicon.ico	Files: Init Files.Client	2020-02-25 09:58:09 +03:00
index.html	Merge branch 'develop' into feature/desktop-view	2020-12-30 16:20:47 +03:00
manifest.json	Files: Init Files.Client	2020-02-25 09:58:09 +03:00