Merge branch 'nightly' into python3

# Conflicts: # plexpy/webserve.py
2020-01-20 20:55:30 -08:00
parent 4c211342a2 b9d5e49a71
commit b39ac866f2
12 changed files with 23 additions and 16 deletions
--- a/plexpy/config.py
+++ b/plexpy/config.py
@@ -608,6 +608,7 @@ _CONFIG_DEFINITIONS = {
    'UPDATE_LABELS': (int, 'General', 1),
    'UPDATE_LIBRARIES_DB_NOTIFY': (int, 'General', 1),
    'UPDATE_NOTIFIERS_DB': (int, 'General', 1),
+    'VERBOSE_LOGS': (int, 'Advanced', 1),
    'VERIFY_SSL_CERT': (bool_int, 'Advanced', 1),
    'VIDEO_LOGGING_ENABLE': (int, 'Monitoring', 1),
    'WEBSOCKET_MONITOR_PING_PONG': (int, 'Advanced', 0),