pavelbannov 02f39a9c71 Merge branch 'master' into feature/files ... # Conflicts: # common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20201006101804_WebstudioDbContextMySql.cs # common/ASC.Core.Common/Migrations/Npgsql/WebstudioDbContextNpgsql/20200929102646_WebstudioDbContextNpgsql.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs # products/ASC.Files/Core/Core/FileStorageService.cs # web/ASC.Web.Core/Files/FileUtility.cs		2020-10-13 12:52:28 +03:00
..
License	revert discard	2020-10-12 22:39:23 +03:00
BillingClient.cs	api-defaultvalue: delete DataContracts	2020-07-08 13:10:09 +03:00
CouponManager.cs	revert discard	2020-10-12 22:39:23 +03:00
Invoice.cs	init commit	2019-05-15 17:56:09 +03:00
ITariffService.cs	init commit	2019-05-15 17:56:09 +03:00
ITariffSyncService.cs	fix	2020-08-27 17:01:37 +03:00
PaymentActive.cs	moved from hotfix/10.5.2	2020-01-17 16:58:26 +03:00
PaymentInfo.cs	IDE0049	2019-08-15 16:16:39 +03:00
Tariff.cs	fix	2020-08-27 17:01:37 +03:00
TariffService.cs	Merge branch 'master' into feature/files	2020-10-13 12:52:28 +03:00
TariffState.cs	init commit	2019-05-15 17:56:09 +03:00
TariffSyncClient.cs	fix	2020-08-27 17:01:37 +03:00
TariffSyncService.cs	revert discard	2020-10-12 22:39:23 +03:00
TariffSyncServiceSection.cs	init commit	2019-05-15 17:56:09 +03:00