Alexey Safronov 586ee3b2f7 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore ... Conflicts: products/ASC.People/Client/src/components/pages/Home/Section/Filter/index.js		2019-09-26 15:45:30 +03:00
..
Client	Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore	2019-09-26 15:45:30 +03:00
Server	Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore	2019-09-25 09:04:30 +03:00