Vladislav Makhov 7b458a72c9 Merge branch 'develop' into feature/private-room ... # Conflicts: # products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js		2020-10-23 15:49:10 +03:00
..
Client	Merge branch 'develop' into feature/private-room	2020-10-23 15:49:10 +03:00
Core	Files: fixed delete	2020-10-16 19:05:21 +03:00
Server	Startup revert	2020-10-22 17:32:53 +03:00
Service	DI: register fix	2020-10-18 19:34:30 +03:00