Merge branch 'general-devel-rest' of github.com:TShock/TShock into general-devel-rest
Conflicts: TShockAPI/TShock.cs
This commit is contained in:
commit
595efa4d41
4 changed files with 60 additions and 24 deletions
|
|
@ -36,5 +36,5 @@ using System.Runtime.InteropServices;
|
|||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
|
||||
|
||||
[assembly: AssemblyVersion("3.3.0.0904")]
|
||||
[assembly: AssemblyFileVersion("3.3.0.0904")]
|
||||
[assembly: AssemblyVersion("3.3.0.0905")]
|
||||
[assembly: AssemblyFileVersion("3.3.0.0905")]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue