Merge branch temp8 into temp8-di

2018-07-12 19:24:24 +02:00
parent f678c72c4d 2051caaa01
commit 68d9b19f65
258 changed files with 9818 additions and 8212 deletions
--- a/src/Umbraco.Web/Composing/CompositionRoots/WebMappingProfilesCompositionRoot.cs
+++ b/src/Umbraco.Web/Composing/CompositionRoots/WebMappingProfilesCompositionRoot.cs
@@ -14,6 +14,7 @@ namespace Umbraco.Web.Composing.CompositionRoots
            container.Register<ContentTypeMapperProfile>();
            container.Register<DataTypeMapperProfile>();
            container.Register<EntityMapperProfile>();
+            container.Register<DictionaryMapperProfile>();
            container.Register<MacroMapperProfile>();
            container.Register<MediaMapperProfile>();
            container.Register<MemberMapperProfile>();