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
..
License	moved from 043e301	2021-11-16 20:40:15 +03:00
BillingClient.cs	Net: fix requests	2021-11-24 22:34:39 +03:00
CouponManager.cs	net6: httpClient: add using	2021-10-21 17:56:31 +03:00
ITariffService.cs	Common, db: moved from 08a01422	2021-05-17 14:35:00 +03:00
PaymentActive.cs	Common, db: moved from 08a01422	2021-05-17 14:35:00 +03:00
PaymentInfo.cs	Common, db: moved from 08a01422	2021-05-17 14:35:00 +03:00
Tariff.cs	Common, db: moved from 08a01422	2021-05-17 14:35:00 +03:00
TariffService.cs	Billing: fix	2021-11-12 15:33:03 +03:00
TariffState.cs	init commit	2019-05-15 17:56:09 +03:00