Artem Tarasov a38195d506 Merge branch 'develop' into bugfix/fixed-styles ... # Conflicts: # products/ASC.CRM/Client/src/custom.scss # products/ASC.Calendar/Client/src/custom.scss # products/ASC.Files/Server/DocStore # products/ASC.Mail/Client/src/custom.scss # products/ASC.People/Client/src/custom.scss # products/ASC.Projects/Client/src/custom.scss # web/ASC.Web.Client/src/custom.scss # web/ASC.Web.Login/src/custom.scss		2021-06-02 10:23:08 +03:00
..
ASC.Web.Api	Merge branch 'develop' into feature/11.5.2	2021-05-31 13:32:51 +03:00
ASC.Web.Client	Merge branch 'develop' into bugfix/fixed-styles	2021-06-02 10:23:08 +03:00
ASC.Web.Core	Merge branch 'develop' into feature/11.5.2	2021-05-31 13:32:51 +03:00
ASC.Web.Editor	Merge branch 'develop' into bugfix/fixed-styles	2021-06-02 10:23:08 +03:00
ASC.Web.Login	Merge branch 'master' into develop	2021-05-29 21:57:42 +03:00
ASC.Web.Studio	add support WindowsService/systemd for IHostBuilder	2021-04-23 16:54:39 +03:00