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

fix merge conflict

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-19 10:54:44 -05:00
parent ff4c684e54
commit c504f5005d
11 changed files with 151 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dashboard-ui/scripts/site.js
View file

@ -1759,6 +1759,11 @@ var AppInfo = {};
require(['themes/halloween/theme']);
return;
}
if (month == 11 && day >= 18 && day <= 26) {
//require(['themes/holiday/theme']);
return;
}
}
function initRequire() {