Vladislav Makhov 967a01061a Merge branch 'develop' into feature/files-recent ... # Conflicts: # products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/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/store/files/selectors.js # web/ASC.Web.Common/src/api/files/index.js # web/ASC.Web.Components/src/components/icons/svg/index.js		2020-10-20 09:23:58 +03:00
..
images	Merge branch 'develop' into feature/files-recent	2020-10-20 09:23:58 +03:00
favicon.ico	Files: Init Files.Client	2020-02-25 09:58:09 +03:00
index.html	Web: Redesigned displaying of loading processes	2020-10-13 15:51:14 +03:00
manifest.json	Files: Init Files.Client	2020-02-25 09:58:09 +03:00