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

Add support for room shares #10834

Merged
merged 3 commits into from
Aug 24, 2018
Merged

Add support for room shares #10834

merged 3 commits into from
Aug 24, 2018

Conversation

nickvergessen
Copy link
Member

#10256 was merged into this branch instead of master...

@MorrisJobke MorrisJobke added this to the Nextcloud 14 milestone Aug 24, 2018
@MorrisJobke
Copy link
Member

Was merged to wrong branch -> so merge it

@MorrisJobke
Copy link
Member

Was merged to wrong branch -> so merge it

"There were 22 failures:" 😭

Maybe we should rebase it - let me do that.

@MorrisJobke MorrisJobke force-pushed the add-support-for-room-shares branch from 69d18cc to 0d58726 Compare August 24, 2018 15:07
@MorrisJobke MorrisJobke added the 3. to review Waiting for reviews label Aug 24, 2018
@rullzer rullzer mentioned this pull request Aug 24, 2018
3 tasks
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer rullzer force-pushed the add-support-for-room-shares branch from 0d58726 to 79a88ed Compare August 24, 2018 16:22
@rullzer rullzer merged commit ede9e38 into master Aug 24, 2018
@rullzer rullzer deleted the add-support-for-room-shares branch August 24, 2018 19:20
@MorrisJobke MorrisJobke mentioned this pull request Aug 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants