Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0

2013-10-02 10:56:54 +02:00
parent 17f2602ca2 be7179b962
commit ffc1b62b8a
5 changed files with 83 additions and 22 deletions
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -424,6 +424,7 @@
    </Compile>
    <Compile Include="Umbraco\Create.aspx.cs">
      <DependentUpon>create.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="Umbraco\Create.aspx.designer.cs">
      <DependentUpon>create.aspx</DependentUpon>