Manually merge v1.4.23 into v2

This commit is contained in:
JonnyWong16 2017-09-30 16:47:26 -07:00
parent 54cd860c13
commit daec864f50
6 changed files with 40 additions and 10 deletions

View file

@ -39,7 +39,8 @@ DEFAULT_ART = "interfaces/default/images/art.png"
PLATFORM_NAME_OVERRIDES = {'Konvergo': 'Plex Media Player',
'Mystery 3': 'Playstation 3',
'Mystery 4': 'Playstation 4',
'Mystery 5': 'Xbox 360'
'Mystery 5': 'Xbox 360',
'WebMAF': 'Playstation 4'
}
PMS_PLATFORM_NAME_OVERRIDES = {'MacOSX': 'Mac'