Merge remote-tracking branch 'origin/general-devel' into fragments

This commit is contained in:
Lucas Nicodemus 2017-12-11 15:52:26 -07:00
commit b923f74782
2 changed files with 3 additions and 2 deletions

View file

@ -26,9 +26,9 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTitle("TShock for Terraria")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Nyx Studios & TShock Contributors")]
[assembly: AssemblyCompany("Pryaxis & TShock Contributors")]
[assembly: AssemblyProduct("TShockAPI")]
[assembly: AssemblyCopyright("Copyright © Nyx Studios 2011-2017")]
[assembly: AssemblyCopyright("Copyright © Pryaxis & TShock Contributors 2011-2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]