mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-09-23 04:43:35 +08:00
Merge
This commit is contained in:
@@ -231,7 +231,6 @@
|
|||||||
<Content Include="Themes\TheAdminClassic\Styles\images\tableHeaderBackground.gif" />
|
<Content Include="Themes\TheAdminClassic\Styles\images\tableHeaderBackground.gif" />
|
||||||
<Content Include="Themes\TheAdminClassic\Styles\images\tableHeaderBackgroundRed.gif" />
|
<Content Include="Themes\TheAdminClassic\Styles\images\tableHeaderBackgroundRed.gif" />
|
||||||
<Content Include="Themes\TheAdminClassic\Styles\site.css" />
|
<Content Include="Themes\TheAdminClassic\Styles\site.css" />
|
||||||
<Content Include="Themes\TheAdminClassic\Theme.gif" />
|
|
||||||
<Content Include="Themes\TheAdminClassic\Theme.txt" />
|
<Content Include="Themes\TheAdminClassic\Theme.txt" />
|
||||||
<Content Include="Themes\TheAdminClassic\Views\Header.ascx" />
|
<Content Include="Themes\TheAdminClassic\Views\Header.ascx" />
|
||||||
<Content Include="Themes\TheAdminClassic\Views\Layout.ascx" />
|
<Content Include="Themes\TheAdminClassic\Views\Layout.ascx" />
|
||||||
@@ -248,6 +247,7 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Folder Include="App_Data\" />
|
<Folder Include="App_Data\" />
|
||||||
|
<Folder Include="Themes\SafeMode\Content\Images\" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||||
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" />
|
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" />
|
||||||
|
Reference in New Issue
Block a user