Alexey Safronov 218ece84e4 Merge branch 'master' into feature/advanced-selector-v2 ... # Conflicts: # web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js		2019-12-19 10:15:25 +03:00
..
Client	Merge branch 'master' into feature/advanced-selector-v2	2019-12-19 10:15:25 +03:00
Server	Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore	2019-12-09 16:08:48 +03:00