1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

Merge remote-tracking branch 'upstream/master' into fix-icons-webos2

Conflicts:
	src/controllers/dashboard/plugins/available.js
	src/controllers/dashboard/plugins/installed.js
This commit is contained in:
Dmitry Lyzo 2020-04-28 16:55:33 +03:00
commit 7905a868c8
60 changed files with 447 additions and 406 deletions

View file

@ -49,6 +49,7 @@
.button-link {
background: transparent;
cursor: pointer;
margin: 0;
padding: 0;
vertical-align: initial;