Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0

Browse Source

Conflicts:
	src/Umbraco.Core/Models/Template.cs

...

This commit is contained in:

Shannon

2014-02-17 11:23:02 +11:00

parent 2aae108cb4 f822400036

commit 234d4cf427

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