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,5 +1,9 @@
# Changelog # Changelog
## v2.1.29 (2019-05-11)
* No additional changes from v2.1.29-beta.
## v2.1.29-beta (2019-04-14) ## v2.1.29-beta (2019-04-14)
* Monitoring: * Monitoring:
@ -141,7 +145,7 @@
## v2.1.20 (2018-09-05) ## v2.1.20 (2018-09-05)
* No changes. * No additional changes from v2.1.20-beta.
## v2.1.20-beta (2018-09-02) ## v2.1.20-beta (2018-09-02)

View file

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