Merge remote-tracking branch 'origin/master'

# Conflicts: # readme.md
2026-08-28 00:56:45 +00:00 · 2020-08-02 12:56:28 +02:00
parent 1362080878 c23fd43a70
commit 8a431470a2
1 changed files with 4 additions and 0 deletions
@@ -1,5 +1,9 @@
 Command  Whitelist is a plugin that allows you to control 
+<<<<<<< HEAD
 precisely what commands players can see and use.
+=======
+precisely what commands players can  and use.
+>>>>>>> origin/master

 <h3>Plugin Features</h3>