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
..
Client	Web:Files:Hocs: fix keyup on create docx after merge	2022-07-11 17:13:51 +03:00
Core	Merge branch 'develop' into feature/migrations-fix	2022-07-19 16:04:29 +03:00
Server	Merge branch 'develop' into feature/migrations-fix	2022-07-14 11:56:07 +03:00
Service	fixed async	2022-07-13 20:09:43 +03:00
Tests	Merge branch 'develop' into feature/migrations-fix	2022-07-14 11:56:07 +03:00