Merge branch 'master' into master

This commit is contained in:
Josh (Vicarious)
2019-06-30 21:40:51 -07:00
committed by GitHub
38 changed files with 286 additions and 157 deletions

View File

@@ -1,7 +1,7 @@
/*
*
* PlaceholderAPI
* Copyright (C) 2018 Ryan McCarthy
* Copyright (C) 2019 Ryan McCarthy
*
* 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