Files
Umbraco-CMS/src/Umbraco.Tests
Shannon 64c126ea61 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/Configuration/GlobalSettings.cs
	src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaResult.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
	src/umbraco.providers/members/UmbracoMembershipProvider.cs
2014-03-14 19:33:53 +11:00
..
2014-02-21 18:09:46 +11:00
2014-02-25 02:36:25 +11:00
2013-11-07 17:16:22 +01:00
2014-01-17 10:27:09 +01:00
2013-11-07 17:16:22 +01:00
2013-11-07 17:16:22 +01:00
2013-11-07 17:16:22 +01:00
2014-02-21 18:03:26 +11:00
2013-04-04 05:05:52 +06:00
2013-11-07 17:16:22 +01:00
2013-09-12 15:31:01 +10:00
2014-02-21 09:54:53 +11:00
2013-05-07 18:57:39 -10:00
2014-02-21 18:04:15 +11:00
2013-12-16 13:55:46 +11:00