Konstantina Chremmou 489d8684e4 Merge remote-tracking branch 'upstream/master' into CAR-2214 ... Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com> # Conflicts: # Branding/branding.sh # mk/archive-unsigned.sh # mk/build.sh # mk/bumpBuildNumber.sh # mk/copy-build-output.sh # mk/declarations.sh # mk/tests-checks-cover.sh # mk/tests-checks.sh		2017-01-24 14:46:57 +00:00
..
Cmd	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
Features	Merge remote-tracking branch 'upstream/master' into CAR-2214	2017-01-24 14:46:57 +00:00
UI	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
Placeholders.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
PluginDescriptor.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
PluginManager.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00