Manual merge of v1.4.21 into v2

This commit is contained in:
JonnyWong16 2017-08-02 21:37:59 -07:00
commit 68072d8340
13 changed files with 120 additions and 16 deletions

View file

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