Manual merge of v1.4.21 into v2

2017-08-02 21:37:59 -07:00
parent 1ac4d43db2 af77e51307
commit 68072d8340
13 changed files with 120 additions and 16 deletions
--- a/data/interfaces/default/js/script.js
+++ b/data/interfaces/default/js/script.js
@@ -261,6 +261,8 @@ function getPlatformImagePath(platformName) {
        return 'images/platforms/pmp.png';
    } else if (platformName.indexOf("DLNA") > -1) {
        return 'images/platforms/dlna.png';
+    } else if (platformName.indexOf("PlexTogether") > -1) {
+        return 'images/platforms/plextogether.png';
    } else {
        return 'images/platforms/default.png';
    }