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.

Sign up for GitHub

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

Jump to bottom

Fix bad rebase merge from Weblate #274

Merged
merged 1 commit into from
Jan 24, 2020
Merged

Fix bad rebase merge from Weblate #274

merged 1 commit into from
Jan 24, 2020

Conversation

joshuaboniface
Copy link
Member

No description provided.

nielsvanvelzen
nielsvanvelzen approved these changes Jan 24, 2020
View reviewed changes
Copy link
Member

@nielsvanvelzen nielsvanvelzen left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Build is still failing because some language files contains strings that were removed. I think this needs to be fixed in weblate so I will merge this for now.

@nielsvanvelzen nielsvanvelzen merged commit 3a077e4 into jellyfin:master Jan 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nielsvanvelzen nielsvanvelzen nielsvanvelzen approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@joshuaboniface @nielsvanvelzen