Merge branch 'nightly' into python3

# Conflicts:
#	plexpy/database.py
#	plexpy/version.py
This commit is contained in:
JonnyWong16 2020-04-12 21:35:29 -07:00
commit 3ca4351aeb
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
10 changed files with 116 additions and 53 deletions

View file

@ -18,4 +18,4 @@
from __future__ import unicode_literals
PLEXPY_BRANCH = "python3"
PLEXPY_RELEASE_VERSION = "v2.2.1"
PLEXPY_RELEASE_VERSION = "v2.2.2-beta"