Fixes merge conflicts

2020-08-07 14:00:56 +02:00
parent 9cafeaf39e 39162f0f6a
commit c57c42d2ec
237 changed files with 29451 additions and 4202 deletions
--- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
@@ -348,6 +348,10 @@ namespace Umbraco.Web.BackOffice.Controllers
                            "imageUrlGeneratorApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<ImageUrlGeneratorController>(
                                controller => controller.GetCropUrl(null, null, null, null, null))
                        },
+                        {
+                            "elementTypeApiBaseUrl", _linkGenerator.GetUmbracoApiServiceBaseUrl<ElementTypeController>(
+                                controller => controller.GetAll())
+                        },
                    }
                },
                {