Konstantina Chremmou 11ce488062 Merge branch 'master' into feature/hyperman ... Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com> # Conflicts: # Jenkinsfile # scripts/xenadmin-build.sh		2021-02-17 14:51:13 +00:00
..
Images	CP-35350 preliminary work: Removed images that are not displayed anywhere on the UI.	2020-12-02 12:34:09 +00:00
Branding.resx	CP-32844: Check and warn if DVSC is configured when updating or upgrading a pool.	2020-03-02 17:46:29 +00:00
branding.sh	Restored branding.sh for local build.	2021-02-17 14:45:36 +00:00
HomePage.ja.mht	CP-31105: Moved the Homepage to the Branding folder and added it to the project as a link.	2019-06-04 16:38:18 +01:00
HomePage.mht	CP-31105: Moved the Homepage to the Branding folder and added it to the project as a link.	2019-06-04 16:38:18 +01:00
HomePage.zh-CN.mht	CP-31105: Moved the Homepage to the Branding folder and added it to the project as a link.	2019-06-04 16:38:18 +01:00