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

Development #984

Merged
merged 73 commits into from
Oct 25, 2017
Merged

Development #984

merged 73 commits into from
Oct 25, 2017

Conversation

ManfredKarrer
Copy link
Member

No description provided.

# Conflicts:
#	doc/build.md
@cbeams
Copy link
Member

cbeams commented Oct 25, 2017

Manfred and I have discussed this off-thread and I'm going ahead with the merge, though I have not actually reviewed anything here. Ideally we'll work in smaller chunks in the future.

@cbeams cbeams merged commit 03f254a into bisq-network:Development Oct 25, 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.

2 participants