Konstantina Chremmou b0c23a2c36 Merge remote-tracking branch 'upstream/master' into feature/cdn-updates ... Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com> # Conflicts: # XenAdmin/Properties/Resources.resx		2023-07-31 11:03:23 +01:00
..
AssemblyInfo.cs	Updated copyright notice on files.	2023-01-30 16:24:16 +00:00
licenses.licx	CP-4816: Initial commit to git repo	2013-06-24 12:41:48 +01:00
Resources.Designer.cs	Merge remote-tracking branch 'upstream/master' into feature/cdn-updates	2023-07-31 11:03:23 +01:00
Resources.ja.resx	CP-43770: Removed images from the WLB credentials dialog. Minor text and layout tweaks:	2023-06-29 18:10:29 +01:00
Resources.resx	Merge remote-tracking branch 'upstream/master' into feature/cdn-updates	2023-07-31 11:03:23 +01:00
Resources.zh-CN.resx	CP-43770: Removed images from the WLB credentials dialog. Minor text and layout tweaks:	2023-06-29 18:10:29 +01:00
Settings.Designer.cs	CP-43265: Added new dialog to configure updates for servers.	2023-07-28 09:36:54 +01:00
Settings.settings	CP-43265: Added new dialog to configure updates for servers.	2023-07-28 09:36:54 +01:00