Merge branch 'master' of https://github.com/jellyfin/jellyfin-web into item-detail-page-

Browse source

# Resolve Conflicts:
#	src/assets/css/librarybrowser.css
#	src/itemdetails.html

...

This commit is contained in:

grafixeyehero 2020-01-30 20:11:40 +03:00

parent 709b48a8a8 f2c24921e1

commit b06afa3305

247 changed files with 5884 additions and 3079 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

480

src/assets/css/librarybrowser.css

View file

File diff suppressed because it is too large Load diff