lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch '1.7.x' into 1.x

Browse Source 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj
This commit is contained in:
Sebastien Ros
2014-03-25 14:38:13 -07:00
parent e298a86081 0bb704e669
commit d6a8cb8b8d
16 changed files with 403 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj
View File

@@ -50,6 +50,7 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
<HintPath>..\..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />