lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge - potentially bad merges in a place or two

Browse Source 
--HG--
branch : composition
This commit is contained in:
Louis DeJardin
2010-10-12 17:43:49 -07:00
parent d57c44bcf2 1e18168dbe
commit 9e00c20a6e
60 changed files with 863 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Tests/Orchard.Framework.Tests.csproj
View File

@@ -246,6 +246,8 @@
<Compile Include="Mvc\Routes\UrlPrefixTests.cs" />
<Compile Include="Records\BigRecord.cs" />
<Compile Include="Scripting\ScriptingTests.cs" />
<Compile Include="Stubs\StubWorkContextAccessor.cs" />
<Compile Include="Stubs\StubExtensionManager.cs" />
<Compile Include="Stubs\StubReportsCoordinator.cs" />
<Compile Include="Stubs\StubVirtualPathProvider.cs" />
<Compile Include="Stubs\StubFileSystem.cs" />