Update upstream and remove hopper patch for #1270

This commit is contained in:
Aikar
2018-07-25 01:11:08 -04:00
parent af561492ab
commit c280d84172
9 changed files with 19 additions and 19 deletions