Update upstream and remove hopper patch for #1270

This commit is contained in:
Aikar
2018-07-25 01:11:08 -04:00
parent 875c84df6f
commit 5992b9f2ad
9 changed files with 12 additions and 299 deletions