JonnyWong16 19d8c1be5a Merge branch 'nightly' into python3 ...

# Conflicts:
#	plexpy/datafactory.py
#	plexpy/libraries.py
#	plexpy/logger.py
#	plexpy/version.py

2020-03-19 19:40:05 -07:00

..

default

Merge branch 'nightly' into python3

2020-03-19 19:40:05 -07:00

newsletters

Fix plural episodes and albums in newsletter templates (Fixes Tautulli/Tautulli-Issues#203)

2020-01-20 20:08:45 -08:00