Sebastiaan Jansssen b76b09026b Merge branch 'dev-v7' into dev-v7.8 ...

# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI.Client/src/assets/img/installer.jpg
#	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/tour.service.js
#	src/Umbraco.Web.UI.Client/src/controllers/search.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/doctypename/doctypename.controller.js
#	src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
#	src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json
#	src/Umbraco.Web/Editors/TourController.cs
#	src/Umbraco.Web/Models/BackOfficeTour.cs
#	src/Umbraco.Web/Models/BackOfficeTourStep.cs
#	src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
#	src/Umbraco.Web/TourFilterResolver.cs
#	src/Umbraco.Web/Trees/MacroTreeController.cs
#	src/Umbraco.Web/WebApi/Filters/FeatureAuthorizeAttribute.cs
#	src/umbraco.cms/businesslogic/Packager/Installer.cs
#	src/umbraco.cms/businesslogic/Packager/PackageInstance/utill.cs

2018-01-31 17:02:03 +01:00

..

build

U4-6171 Continuous Deployment from Visual Studio Online to Azure Websites not working as expected

2015-10-29 16:07:07 +01:00

tools

Converts the xslt tree to a controller, ensures all config for trees is correct and transforms for upgrades applied

2018-01-05 13:44:57 +11:00

UmbracoCms.Core.nuspec

Merge branch 'dev-v7' into dev-v7.8

2018-01-23 11:42:14 -07:00

UmbracoCms.nuspec

Merge branch 'dev-v7' into dev-v7.8

2018-01-31 17:02:03 +01:00