Konstantina Chremmou 67d1ddd1d1 Merge remote-tracking branch 'upstream/master' into feature/hyperman ... 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		2021-05-25 15:51:42 +01:00
..
Images	CP-35350: Moved WLB server icon to the branding folder. Use different arrow files on the WLB credentials dialog.	2021-05-18 11:12:11 +01:00
Branding.resx	Merge remote-tracking branch 'upstream/master' into feature/hyperman	2021-05-25 15:51:42 +01:00
branding.sh	Rebrand Branding.resx instead of the BrandManager.cs. Sorted variables alphabetically and removed unused variable.	2021-03-03 13:50:29 +00:00
HomePage.ja.mht	CP-31105: Moved the Homepage to the Branding folder and added it to the project as a link.	2019-06-04 16:38:18 +01:00
HomePage.mht	CP-31105: Moved the Homepage to the Branding folder and added it to the project as a link.	2019-06-04 16:38:18 +01:00
HomePage.zh-CN.mht	CP-31105: Moved the Homepage to the Branding folder and added it to the project as a link.	2019-06-04 16:38:18 +01:00