2 commits

Author	SHA1	Message	Date
Aikar	fa254d2142	[CI-SKIP] [Auto] Rebuild Patches ... A recent commit has been made that caused patches to be out of order, rebuilding	2018-08-17 18:01:37 -04:00
Aikar	5d42c9c99d	Merge remote-tracking branch 'origin/master' into pre/1.13 ... * origin/master: Use ConcurrentHashMap in JsonList & Optimize (#471) (#1309)	2018-08-11 09:35:11 -04:00