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

5
src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js
View file

@ -1,3 +1,4 @@
<<<<<<< HEAD
import EmbyProgressRing from 'emby-progressring';
import dom from 'dom';
import serverNotifications from 'serverNotifications';
@ -5,6 +6,10 @@ import events from 'events';
import 'registerElement';
/* eslint-disable indent */
=======
define(['emby-progressring', 'dom', 'serverNotifications', 'events', 'webcomponents'], function (EmbyProgressRing, dom, serverNotifications, events) {
'use strict';
>>>>>>> upstream/master
function addNotificationEvent(instance, name, handler) {