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
2013-12-19 12:45:46 +11:00
2014-01-08 18:39:37 +11:00
2013-12-16 13:19:10 +11:00
2013-12-16 17:17:23 +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
2013-04-25 08:44:01 -02:00
2013-11-28 00:09:09 +01:00
2014-01-20 13:59:25 +11:00
2013-10-09 18:13:24 +11:00
2014-03-11 15:02:48 +11:00
2014-03-14 19:24:45 +11:00
2014-03-11 15:02:48 +11:00
2013-12-16 13:19:10 +11:00
2014-03-14 19:33:53 +11:00
2014-02-21 18:03:26 +11:00
2013-12-28 14:35:43 +11:00
2014-03-11 15:02:48 +11:00
2013-09-25 19:09:16 +10:00
2013-10-02 11:41:48 +02:00
2014-02-21 16:32:53 +11:00
2014-03-06 20:22:32 +11:00
2013-04-04 05:05:52 +06:00
2013-09-16 15:52:59 +10:00
2014-03-11 15:02:48 +11:00
2013-11-07 17:16:22 +01:00
2013-09-12 15:31:01 +10:00
2013-10-01 16:42:32 +10:00
2014-02-21 09:54:53 +11:00
2014-02-21 16:32:53 +11:00
2013-09-12 13:09:04 +02:00
2013-05-07 18:57:39 -10:00
2013-07-11 19:46:13 +10:00
2013-09-17 00:14:15 +10:00
2013-11-20 15:54:50 +11:00
2014-03-03 04:17:40 +01:00
2014-01-29 11:21:35 +11:00
2014-02-21 16:32:53 +11:00
2014-02-21 18:04:15 +11:00
2013-11-01 17:32:03 +11:00
2013-10-18 16:18:55 +11:00
2014-03-14 19:33:53 +11:00
2013-12-16 13:55:46 +11:00
2014-01-15 13:29:17 +11:00
2013-12-28 14:35:43 +11:00
2013-11-12 16:07:53 +11:00
2013-11-12 16:07:53 +11:00