Alexey Safronov 7b66b23686 Merge branch 'master' into feature/advanced-selector-v2 ... # Conflicts: # products/ASC.People/Client/yarn.lock # web/ASC.Web.Client/yarn.lock # web/ASC.Web.Common/yarn.lock		2019-12-03 16:41:03 +03:00
..
Client	Merge branch 'master' into feature/advanced-selector-v2	2019-12-03 16:41:03 +03:00
Server	Common nlog config	2019-11-15 11:47:56 +03:00