feat(rebase): rebase

This commit is contained in:
Aiden Vigue
2021-02-15 13:16:28 -05:00
parent 757c0fc29e
commit 19b51592ea
5 changed files with 96 additions and 7 deletions

View File

@@ -486,7 +486,7 @@ const MovieDetails: React.FC<MovieDetailsProps> = ({ movie }) => {
/>
</svg>
<span>
{data.mediaInfo?.mediaUrl || data.mediaInfo?.mediaUrl
{data.mediaInfo?.mediaUrl || data.mediaInfo?.mediaUrl4k
? intl.formatMessage(
settings.currentSettings.mediaServerType ==
MediaServerType.PLEX