mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse source
This commit is contained in:
Techywarrior 2013-04-14 20:42:34 -07:00
commit 02316a115f
15 changed files with 81 additions and 288 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dashboard-ui/scripts/librarybrowser.js
View file

@ -81,7 +81,11 @@
}
else if (item.MediaType == "Game") {
<<<<<<< HEAD
html += "<img class='posterDetailViewImage' style='background:" + LibraryBrowser.getMetroColor(item.Id) + ";' src='css/images/items/list/game.png' />";
=======
html += "<img class='posterDetailViewImage' style='background:" + LibraryBrowser.getMetroColor(item.Id) + ";' src='css/images/items/list/game.png' />";
>>>>>>> 103dcc97e4c89de41919ec2ab1025f8df30e87fb
}
else {