Sebastiaan Janssen
|
9008e6af88
|
Merge branch 'dev-v7' into temp8
# Conflicts:
# docs/CONTRIBUTING_DETAILED.md
# docs/README.md
# src/Umbraco.Core/Configuration/GlobalSettings.cs
# src/Umbraco.Core/StringExtensions.cs
# src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
# src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
# src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html
# src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardvideos.html
# src/Umbraco.Web.UI.Client/src/views/prevalueeditors/boolean.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
# src/Umbraco.Web/PublishedContentExtensions.cs
# src/Umbraco.Web/Trees/LanguageTreeController.cs
|
2018-06-06 21:15:11 +02:00 |
|