anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'nightly' into python3

Browse Source 
# Conflicts:
#	plexpy/activity_pinger.py
#	plexpy/activity_processor.py
#	plexpy/helpers.py
#	plexpy/notifiers.py
#	plexpy/version.py
#	plexpy/webserve.py
This commit is contained in:
JonnyWong16
2020-04-27 18:19:48 -07:00
parent 0343d47a9d fc2faa247a
commit d8f223327e
47 changed files with 566 additions and 3201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plexpy/users.py
View File

@@ -21,7 +21,6 @@ from future.builtins import str
from future.builtins import object
import httpagentparser
import time
import plexpy
if plexpy.PYTHON2: