Merge branch 'master' into develop

Conflicts: README.md
2019-01-01 09:42:03 -08:00 · 2019-01-01 09:42:03 -08:00 · 27ea83b54b
parent 512fb8e544 a296681c8a
commit 27ea83b54b
1 changed files with 1 additions and 1 deletions
--- a/README.md
+++ b/README.md
@ -99,4 +99,4 @@ BentoBox uses Maven, and its Maven repository is kindly provided by [CodeMC](htt
    <scope>provided</scope>
  </dependency>
 </dependencies>
-```
+```