Alexey 6435d8759b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files ... # Conflicts: # products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js		2020-07-08 13:02:01 +03:00
..
ASC.Files	Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files	2020-07-08 13:02:01 +03:00
ASC.People	Web: Fixed header icons width to 17px	2020-06-17 11:26:18 +03:00