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

Directory #62

Merged
merged 3 commits into from
Nov 3, 2016
Merged

Directory #62

merged 3 commits into from
Nov 3, 2016

Conversation

RecursiveForest
Copy link
Contributor

Merge after #61 , as this patch is based on that branch. (Not necessarily, but in order to avoid merge conflicts.)

@JoeLametta JoeLametta merged commit bccba71 into whipper-team:master Nov 3, 2016
@JoeLametta
Copy link
Collaborator

There was a merge conflict (morituri/rip/main.py).
I've merged the PR (hopefully in the right way).

@RecursiveForest RecursiveForest deleted the directory branch November 8, 2016 05:15
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.

2 participants