Merge branch 'develop'

This commit is contained in:
samuele
2012-10-24 16:33:06 +02:00
7 changed files with 6 additions and 4 deletions
+3 -1
View File
@@ -17,4 +17,6 @@
*.suo
/ETS_Data/obj/Release/*
/ETS_Data/obj/Release/*
/ETS_Data/obj/Release
/ETS_Data/obj/Release
+1 -1
View File
@@ -708,7 +708,7 @@
<WebProjectProperties>
<UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>53563</DevelopmentServerPort>
<DevelopmentServerPort>55180</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>
</IISUrl>
+2 -2
View File
@@ -28,13 +28,13 @@
<add key="appName" value="ETS-WS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.0" />
<add key="minRev" value="103" />
<add key="minRev" value="104" />
<add key="copyRight" value="SteamWare, ETS © 2012" />
<add key="tempUplDir" value="~/TempUploads" />
<add key="archiveDir" value="~/ArchivioDocs" />
<add key="archiveDirRed" value="~/ArchivioDocsRed" />
<!--area date-->
<add key="defDayFrom" value="-730" />
<add key="defDayFrom" value="-3650" />
<!--area controlli grid-->
<add key="srcPageSize" value="15" />
<!--update pagina-->
Binary file not shown.
Binary file not shown.