Stephan
69367e0cda
Merge remote-tracking branch 'origin/6.2.0-pubcontent' into 7.0.0-pubcontent
Conflicts:
src/Umbraco.Core/Models/DataTypeDefinition.cs
src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
src/Umbraco.Core/Properties/AssemblyInfo.cs
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
src/umbraco.providers/members/MembersMembershipProvider.cs
2013-10-11 10:24:24 +02:00
..
2013-04-16 04:27:03 -02:00
2013-03-12 01:50:56 +04:00
2013-03-12 01:50:56 +04:00
2013-10-11 10:24:24 +02:00
2013-01-16 13:10:34 -01:00
2013-10-02 11:48:30 +02:00
2013-05-13 21:11:03 -10:00
2013-03-12 01:50:56 +04:00
2013-10-02 11:41:48 +02:00
2013-01-16 13:10:34 -01:00