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

Contents of PR #2276 without duplicated commit #2375

Merged
merged 3 commits into from
Nov 20, 2018

Conversation

ferdnyc
Copy link
Contributor

@ferdnyc ferdnyc commented Nov 19, 2018

This is fschill:file_media_relink merged into current develop, which git was happy to do with no conflicts on my local system. So, I suppose this would be a candidate for merging instead of #2276.

(If what's here is ready for merge. I feel like we weren't totally clear on that yet in #2276, but then got hung up on the conflict.)

fschill and others added 3 commits October 24, 2018 16:23
@DylanC
Copy link
Collaborator

DylanC commented Nov 20, 2018

@ferdnyc - Thanks. I think we were happy enough apart from the input could show more of the input field. (could be a separate update)

@DylanC DylanC merged commit ce9f895 into OpenShot:develop Nov 20, 2018
@ferdnyc ferdnyc deleted the testmerge branch April 14, 2019 06:29
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.

3 participants