Merge branch 'master' into nightly

2019-05-11 10:45:34 -07:00
parent 46e77b074a 2635569e76
commit db5be89710
2 changed files with 7 additions and 3 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog

+## v2.1.29 (2019-05-11)
+* No additional changes from v2.1.29-beta.
+
+
 ## v2.1.29-beta (2019-04-14)

 * Monitoring:
@@ -141,7 +145,7 @@


 ## v2.1.20 (2018-09-05)
-* No changes.
+* No additional changes from v2.1.20-beta.


 ## v2.1.20-beta (2018-09-02)
--- a/plexpy/version.py
+++ b/plexpy/version.py
@@ -1,2 +1,2 @@
-PLEXPY_BRANCH = "beta"
-PLEXPY_RELEASE_VERSION = "v2.1.29-beta"
+PLEXPY_BRANCH = "master"
+PLEXPY_RELEASE_VERSION = "v2.1.29"