[CI-SKIP] Merge branch 'master' into pre/1.13

Browse source

Doesn't actually change anything, these patches were already merged and
just getting git metadata to recognize that.

...

This commit is contained in:

Aikar 2018-08-11 09:44:34 -04:00

parent 5d42c9c99d 895a4dcafc

commit 2dddf8acbb

No known key found for this signature in database

GPG key ID: 401ADFC9891FAAFE

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available