TatianaLopaeva ca420104fc Merge branch 'feature/files' into feature/payments-enterprise ... # Conflicts: # web/ASC.Web.Client/src/App.js # web/ASC.Web.Common/src/components/StudioLayout/StudioLayout.js		2020-09-21 14:54:05 +03:00
..
Client	Web: Files: fixed onExpand SettingsTree	2020-09-19 21:55:03 +03:00
Core	Merge branch 'feature/files' into feature/payments-enterprise	2020-09-15 17:52:45 +03:00
Server	Merge branch 'master' into feature/files	2020-09-08 15:20:05 +03:00
Service	Merge branch 'master' into feature/files	2020-08-20 12:43:12 +03:00