Upstream merge

This commit is contained in:
Thinkofdeath
2015-02-12 14:25:18 +00:00
parent 0c2ee8bf90
commit 0e2ad96a6c
2 changed files with 4 additions and 4 deletions

View File

@@ -39,7 +39,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
}
diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
index 0000000000000000000000000000000000000000..00000000000000000000000000000000000000000
--- /dev/null
+++ b/src/main/java/org/spigotmc/RestartCommand.java
@@ -0,0 +0,0 @@