Skip to content

Conversation

@ghost
Copy link

@ghost ghost commented Dec 12, 2016

We somehow missed this one

License: MIT
Signed-off-by: Lars Gierth <[email protected]>
@ghost ghost added topic/docs-ipfs Topic docs-ipfs topic/releases Topic releases status/in-progress In progress labels Dec 12, 2016
@Kubuxu
Copy link
Member

Kubuxu commented Dec 12, 2016

It is in separate tree, d905d48 but yours is much better.

@Kubuxu Kubuxu added this to the ipfs 0.4.5 milestone Dec 12, 2016
@ghost
Copy link
Author

ghost commented Dec 12, 2016

Sigh, okay. @whyrusleeping I think we should revisit the dont-merge-release-branch-back-to-master rule.

@Kubuxu
Copy link
Member

Kubuxu commented Dec 12, 2016

It would be hard, but yeah, it could be merged with mostly 'ours' strategy.

@whyrusleeping whyrusleeping merged commit 4cb236c into master Dec 12, 2016
@whyrusleeping whyrusleeping deleted the docs/changelog-0.4.4 branch December 12, 2016 17:26
@whyrusleeping whyrusleeping removed the status/in-progress In progress label Dec 12, 2016
@ghost ghost mentioned this pull request Dec 23, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

topic/docs-ipfs Topic docs-ipfs topic/releases Topic releases

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants