Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

Browse Source

Conflicts:
	src/Umbraco.Web/Strategies/Migrations/ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs

...

This commit is contained in:

Shannon

2014-02-25 03:30:32 +11:00

parent 784f873777 651182f5de

commit 2a9b1cb246

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