Andy Butland
|
1d124ea0ac
|
Merge branch 'netcore/netcore' into feature/8651-config-options-patten
# Conflicts:
# src/Umbraco.Tests.Integration/Persistence/Repositories/DictionaryRepositoryTest.cs
# src/Umbraco.Tests.Integration/Persistence/Repositories/LanguageRepositoryTest.cs
# src/Umbraco.Tests.Integration/Persistence/Repositories/TemplateRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
# src/Umbraco.Tests/Services/ContentServiceTests.cs
# src/Umbraco.Tests/Services/UserServiceTests.cs
|
2020-08-27 18:58:12 +02:00 |
|