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

2569.magic status.7 #239

Merged

Conversation

meejah
Copy link
Contributor

@meejah meejah commented Feb 8, 2016

FYI, there were a couple windows changes (from Daira) that apparently had different merge/rebase resolutions in .12 versus earlier magic-folder-stable branches. Shouldn't be a big deal, but turned up when I was rebasing this.

@daira daira merged commit 83a3f70 into tahoe-lafs:2438.magic-folder-stable.12 Feb 9, 2016
@meejah meejah deleted the 2569.magic-status.7 branch March 20, 2018 22:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants