pavelbannov 50f06898d7 Merge branch 'master' into refactoring/di ... # Conflicts: # web/ASC.Web.Api/Controllers/SettingsController.cs		2019-11-10 18:22:02 +03:00
..
Client	web: People: Removed unused function from PeopleRow	2019-11-08 15:03:30 +03:00
Server	DI: refactoring. Extract settings helpers	2019-11-08 15:21:51 +03:00