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

2013-04-14 20:42:34 -07:00
parent d7c4b43899 93e4fb4475
commit 02316a115f
15 changed files with 81 additions and 288 deletions
@@ -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 {