mirror of
https://github.com/xcp-ng/xenadmin.git
synced 2024-11-25 14:27:26 +01:00
67d1ddd1d1
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com> # Conflicts: # Branding/Branding.resx # Jenkinsfile # XenAdmin/Alerts/Types/GuiOldAlert.cs # XenAdmin/Alerts/Types/LicenseAlert.cs # XenAdmin/Commands/RestartToolstackCommand.cs # XenAdmin/Diagnostics/Problems/HostProblem/HostNotSafeToUpgradeWarning.cs # XenAdmin/Dialogs/AllowUpdatesDialog.cs # XenAdmin/Dialogs/OptionsPages/ConfirmationOptionsPage.cs # XenAdmin/Dialogs/RepairSRDialog.cs # XenAdmin/Dialogs/UpsellDialog.cs # XenAdmin/Plugins/UI/TabPageCredentialsDialog.cs # XenAdmin/Program.cs # XenAdmin/Wizards/ConversionWizard/ConversionNetworkPage.cs # XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateDestinationPage.cs # XenAdmin/Wizards/NewSRWizard_Pages/SrWizardType.cs # XenAdmin/Wizards/PatchingWizard/PatchingWizard_FirstPage.cs # XenCenterLib/XSVersionAttribute.cs # XenModel/BrandManager.cs # XenModel/Messages.Designer.cs # XenModel/Messages.resx |
||
---|---|---|
.. | ||
ConversionNetworkPage.cs | ||
ConversionWizard.cs | ||
CredentialsPage.cs | ||
CredentialsPage.Designer.cs | ||
CredentialsPage.ja.resx | ||
CredentialsPage.resx | ||
CredentialsPage.zh-CN.resx | ||
SrSelectionPage.cs | ||
SrSelectionPage.Designer.cs | ||
SrSelectionPage.ja.resx | ||
SrSelectionPage.resx | ||
SrSelectionPage.zh-CN.resx | ||
SummaryPage.cs | ||
SummaryPage.Designer.cs | ||
SummaryPage.ja.resx | ||
SummaryPage.resx | ||
SummaryPage.zh-CN.resx | ||
VmSelectionPage.cs | ||
VmSelectionPage.Designer.cs | ||
VmSelectionPage.ja.resx | ||
VmSelectionPage.resx | ||
VmSelectionPage.zh-CN.resx |