pavelbannov
0bbc383266
# Conflicts: # common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs # common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs # web/ASC.Web.Api/Controllers/PortalController.cs # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Core/Notify/StudioNotifyService.cs |
||
---|---|---|
.. | ||
AzRecordCache.proto | ||
ConsumerCacheItem.proto | ||
GroupCacheItem.proto | ||
NotifyMessage.proto | ||
QuotaCacheItem.proto | ||
SettingsCacheItem.proto | ||
SubscriptionMethodCache.proto | ||
SubscriptionRecord.proto | ||
TariffCacheItem.proto | ||
TenantCacheItem.proto | ||
TenantSetting.proto | ||
UserGroupRefCacheItem.proto | ||
UserInfoCacheItem.proto | ||
UserPhotoCacheItem.proto |