Mihaela Stoica 9accb3c69f Merge branch 'master' into REQ-672 ... Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com> # Conflicts: # XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizardPrecheckPage.cs # XenAdmin/XenAdmin.csproj		2018-07-13 13:14:36 +01:00
..
AsyncServerTime.cs	CA-289153: Do not attempt updating the licence status for disconnected hosts. (#2072)	2018-05-11 16:38:46 +01:00
Helpers.cs	Merge branch 'master' into REQ-672	2018-07-13 13:14:36 +01:00
PrettyTimeSpan.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
PropertyManager.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
Util.cs	Added padding to the upload/download progress numbers to reduce left-right message "jumping".	2018-07-02 17:37:52 +01:00