AlexeySafronov bedfad1ec5 Merge branch 'master' into develop ... # Conflicts: # common/ASC.Core.Common/Caching/CachedUserService.cs # common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs # common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs # common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs # common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs # products/ASC.Files/Client/src/pages/Home/Section/Header/index.js # products/ASC.Files/Client/src/store/DialogsStore.js # products/ASC.Files/Client/src/store/FilesActionsStore.js # products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs # products/ASC.Files/Core/Core/EF/FilesDbContext.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs # products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs # products/ASC.Files/Server/DocStore # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Core/Tfa/TfaManager.cs		2021-12-28 18:21:44 +03:00
..
ASC.Common.Tests	Merge branch 'develop' into feature/net6	2021-11-23 16:40:50 +03:00
ASC.Core.Common.Tests	Merge branch 'develop' into feature/net6	2021-11-23 16:40:50 +03:00
ASC.Notify.Textile.Tests	Merge branch 'develop' into feature/net6	2021-11-23 16:40:50 +03:00
ASC.Web.Api.Tests	Removed unused dependencies. Fixed tests	2021-11-24 12:39:39 +03:00
ASC.Webhooks.Tests	Removed unused dependencies. Fixed tests	2021-11-24 12:39:39 +03:00
Frontend.Translations.Tests	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00