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

[NEW] resolve merge share function #6577

Merged
merged 16 commits into from
Apr 3, 2017
Merged

[NEW] resolve merge share function #6577

merged 16 commits into from
Apr 3, 2017

Conversation

karlprieb
Copy link
Contributor

@RocketChat/core

Closes #4033

This PR is only a merge conflict resolve for #4033

@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-6577 April 3, 2017 19:55 Inactive
@CLAassistant
Copy link

CLAassistant commented Apr 3, 2017

CLA assistant check
Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ karlprieb
❌ tgxn
You have signed the CLA already but the status is still pending? Let us recheck it.

@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-6577 April 3, 2017 20:13 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-6577 April 3, 2017 21:59 Inactive
@engelgabriel engelgabriel merged commit 7651763 into develop Apr 3, 2017
@engelgabriel engelgabriel deleted the tgxn-better-mb branch April 3, 2017 22:55
@engelgabriel engelgabriel added this to the 0.55.0 milestone Apr 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.

4 participants