Merge branch 'develop' of https://github.com/MediaBrowser/plugin.video.emby into develop

Browse Source

# Conflicts:
#	resources/lib/playbackutils.py

...

This commit is contained in:

angelblue05 2018-05-10 20:26:27 -05:00

parent 76a29d2039 fb78d82db4

commit 34a613abc3

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available