Merge branch 'general-devel' into backport-verison-tick

This commit is contained in:
Lucas Nicodemus 2019-03-29 20:41:51 -07:00 committed by GitHub
commit f30f44d00d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
73 changed files with 83 additions and 77 deletions

View file

@ -1,6 +1,6 @@
/*
TShock, a server mod for Terraria
Copyright (C) 2011-2018 Pryaxis & TShock Contributors
Copyright (C) 2011-2019 Pryaxis & TShock Contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -28,7 +28,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Pryaxis & TShock Contributors")]
[assembly: AssemblyProduct("TShockAPI")]
[assembly: AssemblyCopyright("Copyright © Pryaxis & TShock Contributors 2011-2017")]
[assembly: AssemblyCopyright("Copyright © Pryaxis & TShock Contributors 2011-2019")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]