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
..
Client	Merge branch 'feature/files' into feature/loading-acceleration	2020-09-29 11:48:36 +03:00
Core	Merge branch 'feature/files' into feature/payments-enterprise	2020-09-28 16:22:49 +03:00
Server	Files: fix count	2020-09-28 13:41:48 +03:00
Service	Merge branch 'master' into feature/files	2020-08-20 12:43:12 +03:00