Merge branch 'master' of https://github.com/ServiceStackApps/ReactDesktopApps

mythz · mythz · commit 82ac8e6cf633 · 2017-06-26T07:25:44.000-04:00
# Conflicts:
#	src/DefaultApp/DefaultApp/DefaultApp.AppMac/Program.cs
#	src/DefaultApp/DefaultApp/DefaultApp.AppMac/packages.config
diff --git a/src/DefaultApp/DefaultApp/DefaultApp.AppMac/Program.cs b/src/DefaultApp/DefaultApp/DefaultApp.AppMac/Program.cs
@@ -15,7 +15,7 @@ public static class Program
 
 		static void Main (string[] args)
 		{
-            System.Web.Util.HttpEncoder.Current = System.Web.Util.HttpEncoder.Default;
+			System.Web.Util.HttpEncoder.Current = System.Web.Util.HttpEncoder.Default;
 
 			App = new AppHost();
 			App.Init().Start("http://*:2337/");

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public static class Program`
`15`	`15`
`16`	`16`	`static void Main (string[] args)`
`17`	`17`	`{`
`18`		`- System.Web.Util.HttpEncoder.Current = System.Web.Util.HttpEncoder.Default;`
	`18`	`+ System.Web.Util.HttpEncoder.Current = System.Web.Util.HttpEncoder.Default;`
`19`	`19`
`20`	`20`	`App = new AppHost();`
`21`	`21`	`App.Init().Start("http://*:2337/");`