koen
|
213259fde5
|
Merge branch 'main' into subtitle-sizes
# Conflicts:
# Swiftfin/Views/VideoPlayer/VLCPlayerViewController.swift
|
2022-01-09 13:23:22 +01:00 |
|
koen
|
438ce63c5c
|
Provides subtitle size options
|
2022-01-09 13:13:21 +01:00 |
Ethan Pippin
|
b519d40288
|
Merge branch 'main' into final-work-for-winter-break-2022
|
2022-01-07 21:23:48 -07:00 |
|
Ethan Pippin
|
e052d95608
|
Update contents.xcworkspacedata
|
2022-01-07 20:43:05 -07:00 |
|
Ethan Pippin
|
2bdaf173a4
|
cache image attempt
|
2022-01-07 17:58:51 -07:00 |
|
Ethan Pippin
|
73a3f2fcdc
|
rename jellyfinplayer to swiftfin
|
2022-01-07 11:05:54 -07:00 |