Merge branch 'master' of https://github.com/jellyfin/jellyfin-web into icon
# Conflicts: # src/components/multiselect/multiselect.js # src/controllers/devices.js
This commit is contained in:
commit
3f52ec10a0
226 changed files with 9961 additions and 10140 deletions
|
@ -244,9 +244,7 @@ define(["browser", "appStorage", "apphost", "loading", "connectionManager", "glo
|
|||
icon: "refresh"
|
||||
});
|
||||
|
||||
|
||||
|
||||
require(["actionsheet"], function (actionsheet) {
|
||||
require(['actionsheet'], function (actionsheet) {
|
||||
actionsheet.show({
|
||||
items: menuItems,
|
||||
positionTo: e.target,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue