yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v8/feature/mb-embed' into v8/feature/mb-embed

Browse Source
This commit is contained in:
Bjarke Berg
2019-10-31 12:32:51 +01:00
parent 1436441f78 9e3d2c9ed9
commit bf16a5936e
11 changed files with 35 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -80,6 +80,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
<Folder Include="App_Plugins" />
<Folder Include="Views\MacroPartials\" />
</ItemGroup>
<ItemGroup>
@@ -144,9 +145,6 @@
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
<Content Include="App_Plugins\UmbModelsBuilder\modelsbuilder.controller.js" />
<Content Include="App_Plugins\UmbModelsBuilder\modelsbuilder.html" />
<Content Include="App_Plugins\UmbModelsBuilder\modelsbuilder.resource.js" />
<Content Include="Config\grid.editors.config.js" />
<Content Include="Config\Lang\cs-CZ.user.xml" />
<Content Include="Config\Lang\da-DK.user.xml" />
@@ -172,7 +170,6 @@
<Content Include="Umbraco\Config\Lang\zh_tw.xml" />
<Content Include="Config\Splashes\noNodes.aspx" />
<Content Include="Umbraco\Install\Views\Web.config" />
<Content Include="App_Plugins\UmbModelsBuilder\package.manifest" />
<None Include="Config\ClientDependency.Release.config">
<DependentUpon>ClientDependency.config</DependentUpon>
<SubType>Designer</SubType>