AlexeySafronov
7f095f03d1
# Conflicts: # common/ASC.Resource.Manager/Startup.cs # config/kafka.json # web/ASC.Web.Core/PublicResources/UserControlsCommonResource.Designer.cs # web/ASC.Web.Core/PublicResources/UserControlsCommonResource.de.resx # web/ASC.Web.Core/PublicResources/UserControlsCommonResource.es.resx # web/ASC.Web.Core/PublicResources/UserControlsCommonResource.fr.resx # web/ASC.Web.Core/PublicResources/UserControlsCommonResource.it.resx # web/ASC.Web.Core/PublicResources/UserControlsCommonResource.resx # web/ASC.Web.Core/PublicResources/UserControlsCommonResource.ru.resx # web/ASC.Web.Core/TariffSettings.cs |
||
---|---|---|
.. | ||
CustomModeResource.de.resx | ||
CustomModeResource.Designer.cs | ||
CustomModeResource.es.resx | ||
CustomModeResource.fr.resx | ||
CustomModeResource.it.resx | ||
CustomModeResource.resx | ||
CustomModeResource.ru.resx | ||
NamingPeopleResource.de.resx | ||
NamingPeopleResource.Designer.cs | ||
NamingPeopleResource.es.resx | ||
NamingPeopleResource.fr.resx | ||
NamingPeopleResource.it.resx | ||
NamingPeopleResource.resx | ||
NamingPeopleResource.ru.resx | ||
PeopleNames.xml | ||
Resource.de.resx | ||
Resource.Designer.cs | ||
Resource.es.resx | ||
Resource.fr.resx | ||
Resource.it.resx | ||
Resource.resx | ||
Resource.ru.resx | ||
UserControlsCommonResource.de.resx | ||
UserControlsCommonResource.Designer.cs | ||
UserControlsCommonResource.es.resx | ||
UserControlsCommonResource.fr.resx | ||
UserControlsCommonResource.it.resx | ||
UserControlsCommonResource.resx | ||
UserControlsCommonResource.ru.resx | ||
WebPatternResource.Designer.cs | ||
WebPatternResource.resx | ||
webstudio_patterns.xml | ||
WebstudioNotifyPatternResource.de.resx | ||
WebstudioNotifyPatternResource.Designer.cs | ||
WebstudioNotifyPatternResource.es.resx | ||
WebstudioNotifyPatternResource.fr.resx | ||
WebstudioNotifyPatternResource.it.resx | ||
WebstudioNotifyPatternResource.resx | ||
WebstudioNotifyPatternResource.ru.resx |