Correcting user management conflicts

Work Items: 16453, 16543

--HG--
branch : dev
This commit is contained in:
Sébastien Ros
2010-11-20 12:10:47 -08:00
parent 5393c5c825
commit e208860ea2
6 changed files with 80 additions and 22 deletions

View File

@@ -116,6 +116,10 @@
<Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
<Name>Orchard.Framework</Name>
</ProjectReference>
<ProjectReference Include="..\..\Core\Orchard.Core.csproj">
<Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
<Name>Orchard.Core</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Views\Items\Content-User.Edit.cshtml">