xenadmin/XenAdmin/Alerts
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
..
Types Merge branch 'master' into CAR-2184 2016-09-26 13:26:31 +01:00
AlertExtensions.cs CA-122558: Redesign of the updates page according to CAR-107. 2013-12-05 12:46:39 +00:00