Manual merge of v1.4.17 into v2

This commit is contained in:
JonnyWong16
2017-03-04 16:02:37 -08:00
18 changed files with 136 additions and 216 deletions

View File

@@ -1,2 +1,2 @@
PLEXPY_BRANCH = "master"
PLEXPY_RELEASE_VERSION = "1.4.16"
PLEXPY_BRANCH = "master"
PLEXPY_RELEASE_VERSION = "1.4.17"