Merge branch 'master' of https://github.com/jellyfin/jellyfin-web into alphaPicker-tv-mode

Browse Source

# Resolve Conflicts:
#	src/assets/css/librarybrowser.css
#	src/components/alphapicker/style.css

...

This commit is contained in:

grafixeyehero

2020-01-30 20:24:33 +03:00

parent a9ca46b6d8 f2c24921e1

commit 5cb141caa3

250 changed files with 6493 additions and 3168 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

src/assets/css/librarybrowser.css

+309 -225

File diff suppressed because it is too large Load Diff