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
..
Cmd	CP-36392 pt.1: Removed unused using directives.	2021-04-07 10:04:47 +01:00
Features	Merge remote-tracking branch 'upstream/master' into feature/hyperman	2021-05-25 15:51:42 +01:00
UI	Merge remote-tracking branch 'upstream/master' into feature/hyperman	2021-05-25 15:51:42 +01:00
Placeholders.cs	CA-329742, CA-330301: Logging simplification.	2019-11-13 12:31:44 +00:00
PluginDescriptor.cs	CP-36392 pt.1: Removed unused using directives.	2021-04-07 10:04:47 +01:00
PluginManager.cs	Improved previous commit to avoid setting the TabPageFeature Urls when switching	2018-08-15 09:59:58 +01:00