Merge branch 'dev-v7' into 7.3.0

Browse Source

Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js

...

This commit is contained in:

Shannon

2015-04-01 17:45:38 +11:00

parent 0c0802e964 437ab4aaf1

commit 40d3f2ffb9

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