xenadmin/XenAdmin/Alerts/Types
Mihaela Stoica f2b1443064 Merge branch 'master' into CAR-2184
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>

Conflicts:
	XenModel/Messages.Designer.cs
	XenModel/Messages.resx
2016-09-26 13:26:31 +01:00
..
AlarmMessageAlert.cs
DuplicateIqnAlert.cs
GuiOldAlert.cs
IqnAlert.cs
LicenseAlert.cs
MessageAlert.cs
MissingIqnAlert.cs
XenCenterUpdateAlert.cs
XenServerPatchAlert.cs
XenServerUpdateAlert.cs
XenServerVersionAlert.cs