pavelbannov 5a5e299d98 Merge branch 'develop' into feature/webhooks ... # Conflicts: # ASC.Web.sln # common/ASC.Api.Core/Core/BaseStartup.cs # common/services/ASC.Data.Backup/ASC.Data.Backup.csproj # web/ASC.Web.Api/ASC.Web.Api.csproj		2021-10-19 18:30:59 +03:00
..
ASC.Calendar	Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row	2021-10-07 17:47:54 +03:00
ASC.CRM	Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row	2021-10-07 17:47:54 +03:00
ASC.Files	Merge branch 'develop' into feature/webhooks	2021-10-19 18:30:59 +03:00
ASC.Mail	Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row	2021-10-07 17:47:54 +03:00
ASC.People	Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row	2021-10-07 17:47:54 +03:00
ASC.Projects	Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row	2021-10-07 17:47:54 +03:00