merge commit

This commit is contained in:
robvde 2014-10-17 20:40:22 +08:00
commit 41a1b59c85
17 changed files with 668 additions and 183 deletions

View file

@ -333,6 +333,7 @@
<Compile Include="WebAppGallery\GalleryApplication.cs" />
<Compile Include="WebAppGallery\GalleryCategory.cs" />
<Compile Include="WebAppGallery\GalleryErrors.cs" />
<Compile Include="Web\PhpVersion.cs" />
<Compile Include="Web\HtaccessFolder.cs" />
<Compile Include="Web\HttpError.cs" />
<Compile Include="Web\HttpHeader.cs" />