Merge branch 'general-devel' into general-devel

This commit is contained in:
Chris 2019-03-30 13:36:28 +10:30 committed by GitHub
commit 429a5051fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
72 changed files with 76 additions and 76 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