merge branch master into remove-prefixes

2020-01-06 21:22:49 +09:00
parent b2b67b81ef 4610398cb5
commit 34b155cbae
75 changed files with 3529 additions and 532 deletions
@@ -115,7 +115,6 @@ define(['datetime', 'itemHelper', 'css!./indicators.css', 'material-icons'], fun
    }

    function getTimerIndicator(item) {
-
        var status;

        if (item.Type === 'SeriesTimer') {