pavelbannov e0cb81adc4 Merge branch 'master' into refactoring/di ... # Conflicts: # products/ASC.People/Server/Controllers/PeopleController.cs		2019-09-11 21:21:21 +03:00
..
Client	Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore	2019-09-11 16:59:08 +03:00
Server	Merge branch 'master' into refactoring/di	2019-09-11 21:21:21 +03:00