Sebastiaan Janssen c8a19dff44 Merge branch '6.0.7' into 6.1.2 ...

Conflicts:
	src/Umbraco.Web/Media/ImageUrl.cs
	src/Umbraco.Web/Media/ImageUrlProviders/ImageUrlProvider.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs

2013-06-19 18:26:45 +02:00

..

members

Merge branch '6.0.7' into 6.1.2

2013-06-19 18:26:45 +02:00

Properties

Correcting SolutionInfo and AssemblyInfo, so assembly version is correct for all shipped assemblies

2012-11-26 07:46:29 -01:00

SecUtility.cs

Cleaning up folder structure (U4-56)

2012-06-22 20:39:48 +04:00

umbraco.providers.csproj

Fixed U4-1495 Include Umbraco assemblies' XML files to make use of comments

2013-01-18 08:44:39 -01:00

UsersMembershipProvider.cs

Merge branch '6.0.7' into 6.1.2

2013-06-19 18:26:45 +02:00

UsersMembershipUser.cs

Cleaning up folder structure (U4-56)

2012-06-22 20:39:48 +04:00

UsersRoleProvider.cs

Cleaning up folder structure (U4-56)

2012-06-22 20:39:48 +04:00