Shannon
284e440b7e
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# src/Umbraco.Web.UI.Client/package-lock.json
# src/Umbraco.Web.UI.Client/src/canvasdesigner/config/canvasdesigner.config.js
# src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/border.js
# src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/googlefontpicker.js
# src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/margin.js
# src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/padding.js
# src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/radius.js
# src/Umbraco.Web.UI.Client/src/canvasdesigner/lib/spectrum.directive.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/umblaunchminieditor.directive.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/legacydelete.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/querybuilder.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
2018-08-09 15:22:20 +10:00
..
2018-08-09 15:22:20 +10:00
2018-08-02 20:00:35 +10:00
2018-08-08 19:52:00 +02:00
2018-08-08 13:46:19 +02:00
2018-08-09 15:22:20 +10:00
2018-08-08 19:52:00 +02:00
2018-08-09 15:22:20 +10:00