Alexey Safronov 74530bfa76 Merge branch 'master' into feature/asc-web-common ... # Conflicts: # products/ASC.People/Client/src/App.js # web/ASC.Web.Client/src/store/settings/actions.js # web/ASC.Web.Client/src/store/settings/reducer.js		2019-11-19 13:34:36 +03:00
..
Client	Merge branch 'master' into feature/asc-web-common	2019-11-19 13:34:36 +03:00
Server	Common nlog config	2019-11-15 11:47:56 +03:00