mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update upstream Spigot and upstreamMerge script

Browse source 
Also remove paperclip from upstream merge, it shouldn't need merging very often
This commit is contained in:
Zach Brown 2016-03-21 12:32:05 -05:00
parent 667953bb9f
commit 48c7674933
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Spigot

@ -1 +1 @@
Subproject commit 04266858e3436dafcb20eba5ae3c9f6d63a7c5a9
Subproject commit f04e043eb1aa5cb0c8450cd57d88fdb051cf99fd

3
upstreamMerge.sh
View file

@ -12,5 +12,4 @@ function update {
update Bukkit
update CraftBukkit
update Paperclip
update Spigot