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 12:00:02 +03:00
parent ea0d9a0cbd
commit bef8b22bbb
1 changed files with 1 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -339,7 +339,7 @@
<Compile Include="ProviderControls\HyperV2012R2_Settings.ascx.designer.cs">
<DependentUpon>HyperV2012R2_Settings.ascx</DependentUpon>
</Compile>
<Compile Include="ScheduleTaskControls\UserPasswordExpirationNotificationView.ascx.cs">
<Compile Include="ScheduleTaskControls\UserPasswordExpirationNotificationView.ascx.cs">
<DependentUpon>UserPasswordExpirationNotificationView.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
@ -347,27 +347,6 @@
<DependentUpon>SearchObject.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="ScheduleTaskControls\UserPasswordExpirationNotificationView.ascx.designer.cs">
<DependentUpon>UserPasswordExpirationNotificationView.ascx</DependentUpon>
</Compile>
<Compile Include="SettingsUserPasswordExpirationLetter.ascx.cs">
<DependentUpon>SettingsUserPasswordExpirationLetter.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SettingsUserPasswordExpirationLetter.ascx.designer.cs">
<DependentUpon>SettingsUserPasswordExpirationLetter.ascx</DependentUpon>
</Compile>
<Compile Include="SettingsUserPasswordResetLetter.ascx.cs">
<DependentUpon>SettingsUserPasswordResetLetter.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SettingsUserPasswordResetLetter.ascx.designer.cs">
<DependentUpon>SettingsUserPasswordResetLetter.ascx</DependentUpon>
</Compile>
<Compile Include="SearchObject.ascx">
<DependentUpon>SearchObject.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SearchObject.ascx.designer.cs">
<DependentUpon>SearchObject.ascx</DependentUpon>
</Compile>
@ -4911,7 +4890,6 @@
<Content Include="ProviderControls\HyperV2012R2_Settings.ascx" />
<Content Include="SearchObject.ascx" />
<Content Include="ScheduleTaskControls\UserPasswordExpirationNotificationView.ascx" />
<Content Include="SearchObject.ascx" />
<Content Include="SettingsUserPasswordExpirationLetter.ascx" />
<Content Include="SettingsUserPasswordResetLetter.ascx" />
@ -5227,7 +5205,6 @@
</Content>
<Content Include="UserControls\App_LocalResources\MailAccountActions.ascx.resx" />
<Content Include="ScheduleTaskControls\App_LocalResources\UserPasswordExpirationNotificationView.ascx.resx" />
<Content Include="SkinControls\App_LocalResources\SearchObject.ascx.resx" />
<EmbeddedResource Include="UserControls\App_LocalResources\WebsiteActions.ascx.resx" />
<Content Include="VPS\UserControls\App_LocalResources\Generation.ascx.resx">