Merge branch 'nightly' into python3
# Conflicts: # plexpy/version.py
This commit is contained in:
@@ -882,7 +882,7 @@ class DataFactory(object):
|
||||
'custom_thumb_url AS custom_thumb, art AS library_art, custom_art_url AS custom_art, ' \
|
||||
'count, parent_count, child_count ' \
|
||||
'FROM library_sections ' \
|
||||
'WHERE section_id IN (%s) ' \
|
||||
'WHERE section_id IN (%s) AND deleted_section = 0 ' \
|
||||
'ORDER BY section_type, count DESC, parent_count DESC, child_count DESC ' % ','.join(library_cards)
|
||||
result = monitor_db.select(query)
|
||||
except Exception as e:
|
||||
|
@@ -18,4 +18,4 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
PLEXPY_BRANCH = "python3"
|
||||
PLEXPY_RELEASE_VERSION = "v2.2.3-beta"
|
||||
PLEXPY_RELEASE_VERSION = "v2.2.3"
|
||||
|
Reference in New Issue
Block a user