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
..
Helpers.cs	Merge remote-tracking branch 'upstream/master' into feature/REQ-403	2021-09-01 14:43:23 +01:00
PrettyTimeSpan.cs	CP-36392 pt.1: Removed unused using directives.	2021-04-07 10:04:47 +01:00
StringExtensions.cs	Move files to a better location.	2021-01-19 10:37:35 +00:00
TimeSpanExtensions.cs	Move files to a better location.	2021-01-19 10:37:35 +00:00
Util.cs	CP-36567: Use the datasource units as specified in the API instead of deducing them from the datasource name.	2021-08-05 15:36:46 +01:00