Konstantina Chremmou a0a706e9bb Merge branch 'master' into vm-copy-credentials_CA-359712 ... Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com> # Conflicts: # XenAdmin/Wizards/ImportWizard/ImportWizard.cs # XenModel/Actions/VM/VMCopyAction.cs		2021-12-02 22:14:48 +00:00
..
Actions
Alerts
CustomFields
Mappings
Network
Properties
ServerDBs
StorageLinkAPI
Utils
WLB
XCM
XenAPI
XenAPI-Extensions
XenSearch
XenServerProxy
BrandManager.cs
DockerContainer.cs
DockerContainers.cs
Folder.cs
Folders.cs
FriendlyNameManager.cs
FriendlyNames.Designer.cs
FriendlyNames.ja.resx
FriendlyNames.resx
FriendlyNames.zh-CN.resx
HealthCheckSettings.cs
I18NException.cs
Icons.cs
InvisibleMessages.Designer.cs
InvisibleMessages.ja.resx
InvisibleMessages.resx
InvisibleMessages.zh-CN.resx
InvokeHelper.cs
Messages.Designer.cs
Messages.ja.resx
Messages.resx
Messages.zh-CN.resx
ObjectChange.cs
OtherConfigWatcher.cs
PathValidator.cs
PoolJoinRules.cs
RbacMethod.cs
Tags.cs
UnitStrings.Designer.cs
UnitStrings.ja.resx
UnitStrings.resx
UnitStrings.zh-CN.resx
XenAdminConfigManager.cs
XenModel.csproj
XenObjectDownloader.cs
XenServerPlugins.cs