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
..
AuditEventsRepository.cs	Merge branch 'develop' into feature/migrations-fix	2022-07-11 13:28:49 +03:00
LoginEventsRepository.cs	fixed audit/login/last	2022-07-19 14:59:36 +03:00