Merge remote-tracking branch 'origin/master'

# Conflicts:
#	readme.md
This commit is contained in:
youhavetrouble
2020-08-02 12:56:28 +02:00
+4
View File
@@ -1,5 +1,9 @@
Command Whitelist is a plugin that allows you to control Command Whitelist is a plugin that allows you to control
<<<<<<< HEAD
precisely what commands players can see and use. precisely what commands players can see and use.
=======
precisely what commands players can and use.
>>>>>>> origin/master
<h3>Plugin Features</h3> <h3>Plugin Features</h3>