Vladislav Makhov 3064eb302b Merge branch 'develop' into feature/desktop-view ... # Conflicts: # web/ASC.Web.Common/src/pages/login/index.js		2020-12-03 09:59:20 +03:00
..
Client	Merge branch 'develop' into feature/desktop-view	2020-12-03 09:59:20 +03:00
Core	Files: GetSecurityInfo	2020-12-02 16:17:43 +03:00
Server	Merge branch 'develop' into feature/desktop-view	2020-12-03 09:59:20 +03:00
Service	Files: optimization	2020-11-30 23:02:10 +03:00