Gabor Apati-Nagy
|
0174974c93
|
Merge branch 'master' of https://github.com/xenserver/xenadmin into CP-18014
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
Conflicts:
XenAdmin/Wizards/PatchingWizard/PatchingWizard.cs
XenAdmin/Wizards/PatchingWizard/PatchingWizard_PrecheckPage.cs
XenModel/Messages.Designer.cs
XenModel/Messages.ja.resx
XenModel/Messages.resx
XenModel/Messages.zh-CN.resx
|
2016-08-26 15:22:03 +01:00 |
|