Shannon
24e2547656
Merge branch 'u4-8632b' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-8632b
# Conflicts:
# src/Umbraco.Core/Models/Rdbms/UserGroup2NodePermissionDto.cs
# src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaCreation.cs
# src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
# src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
# src/Umbraco.Core/Persistence/Repositories/UserTypeRepository.cs
# src/Umbraco.Core/Persistence/RepositoryFactory.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/Services/SectionService.cs
# src/Umbraco.Core/Services/UserService.cs
# src/Umbraco.Core/Umbraco.Core.csproj
# src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs
# src/Umbraco.Tests/Services/ContentServiceTests.cs
# src/Umbraco.Tests/Umbraco.Tests.csproj
# src/Umbraco.Web.UI/config/trees.config
# src/Umbraco.Web.UI/umbraco/users/PermissionEditor.aspx
# src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
# src/Umbraco.Web/Umbraco.Web.csproj
# src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
2017-05-04 18:29:43 +10:00
..
2013-10-21 18:36:46 +11:00
2013-10-21 18:36:46 +11:00
2017-05-04 18:29:43 +10:00