Merge branch 'dev-v7' into temp8

Browse Source

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
#	src/Umbraco.Web/PropertyEditors/DatePreValueEditor.cs
#	src/Umbraco.Web/WebBootManager.cs

...

This commit is contained in:

Sebastiaan Janssen

2019-01-22 22:06:19 +01:00

parent 45735a5529 e252a0849b

commit 8e61276b8a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available