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

Move translation into dedicated dir #108

Merged
merged 20 commits into from
Jan 3, 2017
Merged

Move translation into dedicated dir #108

merged 20 commits into from
Jan 3, 2017

Conversation

linhe0x0
Copy link
Contributor

@linhe0x0 linhe0x0 commented Jan 2, 2017

Ready for #97

@jwasham
Copy link
Owner

jwasham commented Jan 2, 2017

I pulled another request before this one. That may have resulted in the conflict. Once the conflict is resolved, let me know and I'll pull it. Thank you @sqrthree

@linhe0x0
Copy link
Contributor Author

linhe0x0 commented Jan 3, 2017

@jwasham I have resolved the conflict.

@jwasham jwasham merged commit 7985663 into jwasham:master Jan 3, 2017
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.

5 participants