pavelbannov
bfb9a096e6
# Conflicts: # common/ASC.Core.Common/Billing/License/LicenseReader.cs # common/ASC.Core.Common/Billing/TariffService.cs # common/ASC.Core.Common/Data/DbAzService.cs # common/ASC.Core.Common/Data/DbQuotaService.cs # common/ASC.Core.Common/Data/DbSubscriptionService.cs # common/ASC.Core.Common/Data/DbTenantService.cs # common/ASC.Core.Common/Data/DbUserService.cs # common/ASC.Data.Backup.Core/Core/DbHelper.cs # common/ASC.Feed/Data/FeedAggregateDataProvider.cs # common/ASC.Feed/Data/FeedReadedDataProvider.cs # common/ASC.IPSecurity/Data/IPRestrictionsRepository.cs # common/ASC.Webhooks.Core/DbWorker.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs # products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs # products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs |
||
---|---|---|
.. | ||
Api | ||
ApiModels | ||
Log | ||
Properties | ||
Resources | ||
.gitignore | ||
appsettings.json | ||
ASC.People.csproj | ||
GlobalUsings.cs | ||
PeopleProduct.cs | ||
Program.cs | ||
Startup.cs |