update upstream

This commit is contained in:
Aikar 2016-04-23 22:41:46 -04:00
parent 8b2f631d9b
commit 71db253321
3 changed files with 6 additions and 5 deletions

View file

@ -12,11 +12,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.spigotmc</groupId>
- <artifactId>spigot-parent</artifactId>
- <groupId>org.sonatype.oss</groupId>
- <artifactId>oss-parent</artifactId>
- <version>9</version>
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper-parent</artifactId>
<version>dev-SNAPSHOT</version>
+ <version>dev-SNAPSHOT</version>
</parent>
- <groupId>org.spigotmc</groupId>

@ -1 +1 @@
Subproject commit 78434e8910379dc42d0c9f439d815a6f40eaf2c8
Subproject commit d884ab38d82eeab912a9cf866b5b704e60702679

@ -1 +1 @@
Subproject commit f972b368da8f4aa32dea47c27c5ac428b37f70d3
Subproject commit e6f93f4eed1696907104cb95c00a6f6c035c82f2