Merge branch 'develop'

arttuka · Aug 22, 2017 · b7a3af1 · b7a3af1
2 parents 08dbf28 + 23969ae
commit b7a3af1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/mtg-pairings-server/resources/public/css/main.css b/mtg-pairings-server/resources/public/css/main.css
@@ -313,6 +313,7 @@ h3 {
 .organizer-pairings .pairing .names .opponent {
   display: inline-block;
   width: 215px;
+  white-space: nowrap;
 }
 
 .organizer-pairings .pairing .names .hidden-xs,
@@ -403,4 +404,4 @@ h3 {
   .pairing.no-round {
     height: 30px;
   }
-}
+}
diff --git a/mtg-pairings-win/MtgPairings/MtgPairings/App.xaml.cs b/mtg-pairings-win/MtgPairings/MtgPairings/App.xaml.cs
@@ -3,6 +3,7 @@
 using System.Configuration;
 using System.Data;
 using System.Linq;
+using System.Net;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Forms;
@@ -21,6 +22,7 @@ public partial class App : System.Windows.Application
     {
         private void ApplicationStartup(object sender, StartupEventArgs e)
         {
+            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
             Current.ShutdownMode = ShutdownMode.OnExplicitShutdown;
             if(Settings.Default.Apikey == "")
             {

diff --git a/mtg-pairings-win/MtgPairings/MtgPairings/Properties/AssemblyInfo.cs b/mtg-pairings-win/MtgPairings/MtgPairings/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.1.0")]
-[assembly: AssemblyFileVersion("1.2.1.0")]
+[assembly: AssemblyVersion("1.2.2.0")]
+[assembly: AssemblyFileVersion("1.2.2.0")]