Vladislav Makhov 813c9c4b1d Merge branch 'develop' into feature/desktop-view ... # Conflicts: # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js # web/ASC.Web.Common/src/components/NavMenu/index.js # web/ASC.Web.Common/src/pages/login/index.js # web/ASC.Web.Common/src/store/auth/actions.js		2020-11-30 15:16:49 +03:00
..
Client	Merge branch 'develop' into feature/desktop-view	2020-11-30 15:16:49 +03:00
Core	Remove todo	2020-11-27 17:06:26 +03:00
Server	Merge branch 'develop' into feature/desktop-view	2020-11-30 15:16:49 +03:00
Service	Thirdparty: refactoring	2020-11-17 17:41:42 +03:00