mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2026-01-19 17:51:45 +08:00
Merged 'feature/layouteditor' into 1.x.
This commit is contained in:
@@ -299,6 +299,10 @@
|
||||
<Content Include="Scripts\jquery-migrate-1.2.1.min.js" />
|
||||
<Content Include="Scripts\colorbox\jquery.colorbox.min.js" />
|
||||
<Content Include="Scripts\colorbox\jquery.colorbox.js" />
|
||||
<Content Include="Scripts\jquery.cookie.js" />
|
||||
<Content Include="Scripts\jquery.cookie.min.js">
|
||||
<DependentUpon>jquery.cookie.js</DependentUpon>
|
||||
</Content>
|
||||
<Content Include="Scripts\jquery.plugin.js" />
|
||||
<Content Include="Scripts\jquery.plugin.min.js" />
|
||||
<Content Include="Scripts\timeentry\jquery.timeentry-ar.js" />
|
||||
@@ -576,6 +580,11 @@
|
||||
<ItemGroup>
|
||||
<Content Include="Scripts\jquery-1.11.1.min.map" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="Scripts\jquery.cookie.min.js.map">
|
||||
<DependentUpon>jquery.cookie.min.js</DependentUpon>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
<PropertyGroup>
|
||||
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
|
||||
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
|
||||
|
||||
Reference in New Issue
Block a user