Merge branch 'master' into nightly

This commit is contained in:
JonnyWong16 2019-05-11 10:45:34 -07:00
commit db5be89710
2 changed files with 7 additions and 3 deletions

View file

@ -1,2 +1,2 @@
PLEXPY_BRANCH = "beta"
PLEXPY_RELEASE_VERSION = "v2.1.29-beta"
PLEXPY_BRANCH = "master"
PLEXPY_RELEASE_VERSION = "v2.1.29"