Merge branch '4.4.0'
authorshane <shneuvil@microsoft.com>
Sun, 24 Nov 2019 00:19:34 +0000 (17:19 -0700)
committershane <shneuvil@microsoft.com>
Sun, 24 Nov 2019 00:19:34 +0000 (17:19 -0700)
commit87d720c71ec1c8f8fea2daf2105ba4b6689d71f1
tree1a48d84cb73ce2dc059615245f52b87ff2f9df0f
parent3162a8578ddb580d76b80d43b7bd0667b89b44c3
parenta977333a5cf7b1a06bdda3b689440a66cfe73940
Merge branch '4.4.0'

# Conflicts:
# Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/TestPages.cs
# Xamarin.Forms.Core/Button.cs
# Xamarin.Forms.Core/IImageElement.cs
# Xamarin.Forms.Platform.iOS/Renderers/ShellSectionRootHeader.cs
15 files changed:
Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/TestPages.cs
Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
Xamarin.Forms.Core/Button.cs
Xamarin.Forms.Core/IImageElement.cs
Xamarin.Forms.Core/Image.cs
Xamarin.Forms.Core/ImageButton.cs
Xamarin.Forms.Core/ImageElement.cs
Xamarin.Forms.Core/Items/CarouselView.cs
Xamarin.Forms.CustomAttributes/TestAttributes.cs
Xamarin.Forms.Platform.Android/AppCompat/ImageButtonRenderer.cs
Xamarin.Forms.Platform.Android/Renderers/EntryRenderer.cs
Xamarin.Forms.Platform.Android/Renderers/ShellToolbarTracker.cs
Xamarin.Forms.Platform.UAP/ListViewRenderer.cs
Xamarin.Forms.Platform.UAP/Resources.xaml