mirror of
https://github.com/xcp-ng/xenadmin.git
synced 2024-11-25 23:10:16 +01:00
86d2acee7f
Conflicts: CFUValidator/CFUValidator.cs CFUValidator/OutputDecorators/XenCenterUpdateDecorator.cs CFUValidator/OutputDecorators/XenServerUpdateDecorator.cs XenAdmin/TabPages/ManageUpdatesPage.cs XenAdmin/Wizards/PatchingWizard/PatchingWizard.cs XenAdmin/Wizards/PatchingWizard/PatchingWizard_PrecheckPage.cs XenModel/Actions/Updates/XenCenterVersion.cs XenModel/Actions/Updates/XenServerVersion.cs XenModel/Messages.Designer.cs XenModel/Messages.resx |
||
---|---|---|
.. | ||
AlarmMessageAlert.cs | ||
DuplicateIqnAlert.cs | ||
GuiOldAlert.cs | ||
IqnAlert.cs | ||
LicenseAlert.cs | ||
MessageAlert.cs | ||
MissingIqnAlert.cs | ||
XenCenterUpdateAlert.cs | ||
XenServerPatchAlert.cs | ||
XenServerUpdateAlert.cs | ||
XenServerVersionAlert.cs |