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

Browse Source

Conflicts:
	src/Umbraco.Core/DatabaseContext.cs
	src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/install/utills/LegacyClasses.cs

...

This commit is contained in:

Stephan

2013-12-13 13:05:10 +01:00

parent 8a3eae9ea6 5aec753859

commit 98c8d637f4

8 changed files with 772 additions and 674 deletions

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

769

src/Umbraco.Core/Strings/DefaultShortStringHelper.cs

File diff suppressed because it is too large Load Diff