Konstantina Chremmou 5ee8230834 Merge remote-tracking branch 'upstream/master' into feature/REQ-403 ... Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com> # Conflicts: # XenAdmin/Alerts/Types/CertificateAlert.cs # XenAdmin/Commands/DisconnectWlbServerCommand.cs # XenAdmin/Commands/ViewWorkloadReportsCommand.cs # XenAdmin/TabPages/GeneralTabPage.cs # XenModel/PoolJoinRules.cs		2021-09-01 14:43:23 +01:00
..
Types	Merge remote-tracking branch 'upstream/master' into feature/REQ-403	2021-09-01 14:43:23 +01:00
AlertExtensions.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
NewVersionPriorityAlertComparer.cs	Use more generic names for client version updates, checks, alerts etc.	2021-06-09 15:52:10 +01:00