Merge branch 'nightly' into python3

# Conflicts: # plexpy/activity_pinger.py # plexpy/activity_processor.py # plexpy/helpers.py # plexpy/notifiers.py # plexpy/version.py # plexpy/webserve.py
2020-04-27 18:19:48 -07:00
parent 0343d47a9d fc2faa247a
commit d8f223327e
47 changed files with 566 additions and 3201 deletions
--- a/plexpy/newsletter_handler.py
+++ b/plexpy/newsletter_handler.py
@@ -18,7 +18,6 @@
 from __future__ import unicode_literals

 import os
-import time

 from apscheduler.triggers.cron import CronTrigger
 import email.utils