pavelbannov b98524532f Merge branch 'develop' into feature/migrations-fix ... # Conflicts: # common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs # common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs # common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220711152836_VoipDbContextMySql.Designer.cs # common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs # common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/20220711152837_VoipDbContextPostgreSql.Designer.cs # common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs		2022-07-19 16:04:29 +03:00
..
ASC.Web.Api	Merge branch 'develop' into feature/migrations-fix	2022-07-19 16:04:29 +03:00
ASC.Web.Client	Web: Client: Settings: disabled autofocus	2022-07-12 13:50:55 +03:00
ASC.Web.Core	Merge branch 'develop' into feature/migrations-fix	2022-07-19 16:04:29 +03:00
ASC.Web.Editor	Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2	2022-07-04 18:04:06 +03:00
ASC.Web.HealthChecks.UI	refactoring	2022-04-15 12:08:06 +03:00
ASC.Web.Login	Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2	2022-07-04 18:04:06 +03:00
ASC.Web.Studio	removed referencies	2022-07-06 18:47:16 +03:00