Files
Umbraco-CMS/src/Umbraco.Web.UI.Client/gulp
Bjarke Berg b1d214a13d Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation
# Conflicts:
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
#	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
2020-04-01 15:52:23 +02:00
..