Merge branch 'general-devel' into general-devel

This commit is contained in:
Lucas Nicodemus 2017-12-10 12:41:44 -07:00 committed by GitHub
commit abaeef5f7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

4
.github/config.yml vendored
View file

@ -1,5 +1,5 @@
updateDocsComment: >
Thanks for the pull request! TShock's maintainers would like you to go ahead and give yourself credit by updating the `CHANGELOG.md` file before this gets merged. This helps us document changes to TShock, as well as give you credit for your work. You deserve it! :sparkles:
Thanks for the pull request! TShock's maintainers would like you to go ahead and give yourself credit by updating the `CHANGELOG.md` as soon as you can. Your pull request will likely not be accepted without this. This both helps us document changes to TShock, as well as give you credit for your work. You deserve it, so go take credit! :sparkles:
updateDocsWhiteList:
- bug
@ -7,4 +7,4 @@ updateDocsWhiteList:
updateDocsTargetFiles:
- README
- CHANGELOG.md
- CHANGELOG.md