cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-26 06:27:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation-server-tools into 353-Seperation

Browse Source
This commit is contained in:
Cyberboss
2017-11-13 12:21:11 -05:00
parent 667a7a772e 99200ce130
commit f8b35f147c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AssemblyInfo.global.cs
+3 -3
View File
@@ -3,8 +3,8 @@ using System.Runtime.CompilerServices;
//You cannot one definition the version number
//Believe me, I've tried, the compiler hates it so much
[assembly: AssemblyVersion("3.2.0.5")]
[assembly: AssemblyFileVersion("3.2.0.5")]
[assembly: AssemblyInformationalVersion("3.2.0.5")]
[assembly: AssemblyVersion("3.2.0.6")]
[assembly: AssemblyFileVersion("3.2.0.6")]
[assembly: AssemblyInformationalVersion("3.2.0.6")]
[assembly: InternalsVisibleTo("TGS.Tests")]
TGS.Server/Instance/Repository.cs
+1 -1
View File
@@ -926,7 +926,7 @@ namespace TGS.Server
}
//so we'll know if this fails
var Result = MergeBranch(atSHA ?? LocalBranchName, String.Format("Test merge commit for pull request #{0}{1}Server Instance: {2}", PRNumber, Config.Name));
var Result = MergeBranch(atSHA ?? LocalBranchName, String.Format("Test merge commit for pull request #{0}{1}Server Instance: {2}", PRNumber, Environment.NewLine, Config.Name));
if (Result == null)
try