Upstream merge

2014-06-26 15:07:23 -05:00
parent 6e3ee2f859
commit 395268c602
6 changed files with 119 additions and 2 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,7 @@
    <url>https://github.com/SpigotMC/Spigot</url>

    <modules>
+        <module>MinecraftRelocate</module>
        <module>Spigot-Server</module>
        <module>Spigot-API</module>
    </modules>