AlexeySafronov a31dc583c1 Merge branch 'develop' into feature/personal ... # Conflicts: # products/ASC.Files/Client/src/HOCs/withFileActions.js # products/ASC.Files/Client/src/components/panels/SharingPanel/index.js # products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js # products/ASC.Files/Client/src/pages/Settings/index.js		2021-07-02 16:26:45 +03:00
..
ASC.Web.Api	Merge branch 'develop' into feature/personal	2021-06-30 16:09:53 +03:00
ASC.Web.Client	Merge branch 'develop' into feature/personal	2021-07-02 16:26:45 +03:00
ASC.Web.Core	Merge branch 'develop' into feature/personal	2021-06-17 14:25:09 +03:00
ASC.Web.Editor	Web: People: deleted fonts with ext .woff, added hash to font name	2021-06-08 15:26:56 +03:00
ASC.Web.HealthChecks.UI	fixed urls	2021-06-23 20:12:50 +03:00
ASC.Web.Login	Merge branch 'develop' into bugfix/fixed-styles	2021-06-08 17:58:29 +03:00
ASC.Web.Studio	merge from develop	2021-06-23 16:10:46 +03:00