9949e2676d
Conflicts: build/UmbracoVersion.txt src/SolutionInfo.cs src/Umbraco.Core/Configuration/UmbracoVersion.cs src/Umbraco.Web.UI.Client/bower.json src/Umbraco.Web.UI.Client/src/less/main.less src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html src/Umbraco.Web.UI/Umbraco.Web.UI.csproj src/Umbraco.Web.UI/config/Dashboard.Release.config src/Umbraco.Web/Umbraco.Web.csproj