Merge tag '1.9.6'

Conflicts: assets/checksums.txt assets/thirdparties/pgl.yoyo.org/as/serverlist.txt
nicole-ashley · Sep 13, 2016 · 0bdba85 · 0bdba85
2 parents f4ff5dc + cc54982
commit 0bdba85
Show file tree

Hide file tree

Showing 66 changed files with 250 additions and 15,766 deletions.
diff --git a/assets/checksums.txt b/assets/checksums.txt
diff --git a/assets/thirdparties/pgl.yoyo.org/as/README.md b/assets/thirdparties/pgl.yoyo.org/as/README.md