Permalink
Browse files

Merge branch 'develop'

# Conflicts:
#	Installer/VersionInfo.ini
#	MultiMiner.Blockchain/Properties/AssemblyInfo.cs
#	MultiMiner.CoinApi/Properties/AssemblyInfo.cs
#	MultiMiner.CoinChoose/Properties/AssemblyInfo.cs
#	MultiMiner.CoinWarz/Properties/AssemblyInfo.cs
#	MultiMiner.Coinbase/Properties/AssemblyInfo.cs
#	MultiMiner.Discovery/Properties/AssemblyInfo.cs
#	MultiMiner.Engine/Properties/AssemblyInfo.cs
#	MultiMiner.ExchangeApi/Properties/AssemblyInfo.cs
#	MultiMiner.MobileMiner/Properties/AssemblyInfo.cs
#	MultiMiner.MultipoolApi/Properties/AssemblyInfo.cs
#	MultiMiner.NiceHash/Properties/AssemblyInfo.cs
#	MultiMiner.Remoting/Properties/AssemblyInfo.cs
#	MultiMiner.Services/Properties/AssemblyInfo.cs
#	MultiMiner.Stats/Properties/AssemblyInfo.cs
#	MultiMiner.TUI/Properties/AssemblyInfo.cs
#	MultiMiner.UX/Properties/AssemblyInfo.cs
#	MultiMiner.Update/Properties/AssemblyInfo.cs
#	MultiMiner.Utility/Properties/AssemblyInfo.cs
#	MultiMiner.WhatMine/Properties/AssemblyInfo.cs
#	MultiMiner.WhatToMine/Properties/AssemblyInfo.cs
#	MultiMiner.Win/Properties/AssemblyInfo.cs
#	MultiMiner.Xgminer.Api/Properties/AssemblyInfo.cs
#	MultiMiner.Xgminer.Discovery/Properties/AssemblyInfo.cs
#	MultiMiner.Xgminer/Properties/AssemblyInfo.cs
  • Loading branch information...
nwoolls committed Jul 5, 2017
2 parents 9723b05 + a5a088b commit b6b1d4b8d62538d29686d8af685c1b4ac4ea14e6
@@ -31,6 +31,6 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("4.0.3.360")]
[assembly: AssemblyVersion("4.0.3.360")]
[assembly: AssemblyFileVersion("4.0.3.360")]
// [assembly: AssemblyVersion("4.0.4.362")]
[assembly: AssemblyVersion("4.0.4.362")]
[assembly: AssemblyFileVersion("4.0.4.362")]
@@ -36,7 +36,7 @@ public static WebBrowser GetWebBrowser(string controller, string emailAddress, s
embeddedBrowser.Navigated += HandleBrowserNavigated;
//known issues with the IE7 Compatibility Mode that WebBrowser users
//known issues with the IE7 Compatibility Mode that WebBrowser uses
embeddedBrowser.ScriptErrorsSuppressed = true;
}

0 comments on commit b6b1d4b

Please sign in to comment.