zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
alexY 2015-04-28 10:52:27 +03:00
parent 81fa984bdc
commit b171a34fb0
3 changed files with 39 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
View file

@ -364,7 +364,7 @@
<Compile Include="SettingsUserPasswordResetLetter.ascx.designer.cs">
<DependentUpon>SettingsUserPasswordResetLetter.ascx</DependentUpon>
</Compile>
<Compile>
<Compile Include="SearchObject.ascx">
<DependentUpon>SearchObject.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>