Skip to content

Add support for room shares - #10834

Merged
rullzer merged 3 commits into
masterfrom
add-support-for-room-shares
Aug 24, 2018
Merged

Add support for room shares#10834
rullzer merged 3 commits into
masterfrom
add-support-for-room-shares

Conversation

@nickvergessen

Copy link
Copy Markdown
Member

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

@MorrisJobkeMorrisJobke added this to the Nextcloud 14 milestone Aug 24, 2018
@MorrisJobke

Copy link
Copy Markdown
Member

Was merged to wrong branch -> so merge it

@MorrisJobke

Copy link
Copy Markdown
Member

Was merged to wrong branch -> so merge it

"There were 22 failures:" 😭

Maybe we should rebase it - let me do that.

@MorrisJobke
MorrisJobkeforce-pushed the add-support-for-room-shares branch from 69d18cc to 0d58726CompareAugust 24, 2018 15:07
@MorrisJobkeMorrisJobke added the 3. to review Waiting for reviews label Aug 24, 2018
@rullzerrullzer 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
rullzerforce-pushed the add-support-for-room-shares branch from 0d58726 to 79a88edCompareAugust 24, 2018 16:22
@rullzer
rullzer merged commit ede9e38 into masterAug 24, 2018
@rullzer
rullzer deleted the add-support-for-room-shares branch August 24, 2018 19:20
@MorrisJobkeMorrisJobke mentioned this pull request Aug 24, 2018
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@nickvergessen@MorrisJobke@rullzer@danxuliu