Merge branch 'master' of github.com:thecapsaicinkid/shoryuken

Conflicts: Web/Squirrel/Scripts/viewmodels/authViewModel.js
domholmes · Feb 25, 2014 · d782a89 · d782a89
2 parents 88f4951 + f04fd04
commit d782a89
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Web/Squirrel/Squirrel.csproj b/Web/Squirrel/Squirrel.csproj
@@ -456,7 +456,7 @@
           <AutoAssignPort>False</AutoAssignPort>
           <DevelopmentServerPort>50625</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://dev.squirrel-beta.com</IISUrl>
+          <IISUrl>http://localhost:4567</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>