merge from dev

This commit is contained in:
Luke Pulverenti 2016-01-18 14:09:47 -05:00
parent 576ca0442c
commit ea40b82361

View File

@ -1886,6 +1886,7 @@ var AppInfo = {};
};
requirejs.config({
waitSeconds: 0,
map: {
'*': {
'css': bowerPath + '/emby-webcomponents/requirecss',