AlexeySafronov ad4b28d1f2 Merge branch 'feature/files' into feature/loading-acceleration ... # Conflicts: # products/ASC.Files/Client/public/index.html # products/ASC.Files/Client/src/App.js # products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js # products/ASC.Files/Client/src/components/Article/Body/index.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/index.js # products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js # products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js # products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js # web/ASC.Web.Client/src/App.js # web/ASC.Web.Common/src/components/index.js		2020-09-29 11:48:36 +03:00
..
images	Return lock.png	2020-09-24 13:05:17 +03:00
skins/default/images/svg	Moved Studio->ClientApp to separated ASC.Web.Client folder	2019-07-09 14:51:18 +03:00
favicon.ico	Moved Studio->ClientApp to separated ASC.Web.Client folder	2019-07-09 14:51:18 +03:00
index.html	Web: Clients: Added #temp-content markup on load and opportunity to hide it + router refactoring	2020-09-23 18:42:47 +03:00
manifest.json	Moved Studio->ClientApp to separated ASC.Web.Client folder	2019-07-09 14:51:18 +03:00