Merge branch 'nightly' into python3

# Conflicts:
#	plexpy/database.py
#	plexpy/version.py
This commit is contained in:
JonnyWong16
2020-03-28 15:27:13 -07:00
2 changed files with 23 additions and 2 deletions

View File

@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
# This file is part of Tautulli.
#
@@ -18,4 +18,4 @@
from __future__ import unicode_literals
PLEXPY_BRANCH = "python3"
PLEXPY_RELEASE_VERSION = "v2.2.0"
PLEXPY_RELEASE_VERSION = "v2.2.1"