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 remote-tracking branch 'upstream/master' into es6

Browse source 
With conflicts
This commit is contained in:
MrTimscampi 2020-07-24 10:23:14 +02:00
commit 3713091382
165 changed files with 4194 additions and 2714 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/itemidentifier/itemidentifier.js
View file

@ -240,13 +240,19 @@ import 'cardStyle';
html += '</div>';
html += '</div>';
<<<<<<< HEAD
let numLines = 2;
=======
var numLines = 3;
>>>>>>> upstream/master
if (currentItemType === 'MusicAlbum') {
numLines++;
}
const lines = [result.Name];
lines.push(result.SearchProviderName);
if (result.AlbumArtist) {
lines.push(result.AlbumArtist.Name);
}