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

Allow using "file:///" urls in Android. #122

Merged
merged 8 commits into from
Nov 15, 2018

Conversation

devxpy
Copy link
Contributor

@devxpy devxpy commented Jul 11, 2018

Fixes #120

@lejard-h
Copy link
Collaborator

Thanks for PR, could you resolve conflicts ?

@devxpy
Copy link
Contributor Author

devxpy commented Jul 28, 2018

Don't merge yet, let me test if it works (used online resolver for now)...

@devxpy
Copy link
Contributor Author

devxpy commented Jul 29, 2018

Okay, should be good to go.

@devxpy
Copy link
Contributor Author

devxpy commented Jul 29, 2018

I have #23 solved (for Android) in my local branch, should I issue a new pull request or let it in with this one?

@lejard-h
Copy link
Collaborator

lejard-h commented Aug 1, 2018

sorry I merge some pull request that created conflict, I will stop until you resolve yours

Yes please can you open a new PR for #23

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