Andrey Savihin c267ade176 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore ... # Conflicts: # web/ASC.Web.Components/src/components/layout/index.js		2019-07-04 19:14:03 +03:00
..
sub-components	web: Fix Layout component (first approximation)	2019-07-04 19:01:56 +03:00
index.js	Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore	2019-07-04 19:14:03 +03:00