Shannon
78336181ea
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
src/Umbraco.Core/Models/Membership/MembershipExtensions.cs
src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
src/Umbraco.Core/Security/MembershipProviderBase.cs
src/Umbraco.Core/Services/IMemberService.cs
src/Umbraco.Tests/App.config
src/Umbraco.Tests/Membership/MembershipProviderBaseTests.cs
src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs
src/Umbraco.Tests/Umbraco.Tests.csproj
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/config/tinyMceConfig.Release.config
src/Umbraco.Web.UI/config/tinyMceConfig.config
src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js
src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/member.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs
src/umbraco.controls/TabView.cs
src/umbraco.providers/members/UmbracoMembershipProvider.cs
2014-01-02 15:28:42 +11:00
..
2014-01-02 15:28:42 +11:00
2014-01-02 15:28:42 +11:00
2013-12-23 16:14:52 -08:00
2014-01-02 15:28:42 +11:00
2013-12-19 11:41:03 +11:00
2013-12-05 16:18:45 +11:00
2013-12-06 11:22:16 +11:00
2014-01-02 15:28:42 +11:00
2014-01-02 15:28:42 +11:00
2014-01-02 15:28:42 +11:00
2014-01-02 15:28:42 +11:00
2013-12-27 21:55:59 +01:00