Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use new ReadAllLines extensions #4986

Merged
merged 1 commit into from May 6, 2021
Merged

Conversation

Bond-009
Copy link
Member

@Bond-009 Bond-009 commented Jan 8, 2021

Depends on #4984

@Bond-009 Bond-009 added the blocked Blocked by another pull request label Jan 8, 2021
@Bond-009 Bond-009 changed the title Use SubtitleEdit to parse subtitles Use new ReadAllLines extensions Jan 8, 2021
@barronpm barronpm added merge conflict Merge conflicts should be resolved before a merge and removed blocked Blocked by another pull request labels Feb 26, 2021
@jellyfin-bot jellyfin-bot removed the merge conflict Merge conflicts should be resolved before a merge label May 6, 2021
@Bond-009 Bond-009 merged commit 4b31c00 into jellyfin:master May 6, 2021
@Bond-009 Bond-009 deleted the readalllines branch May 6, 2021 15:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants