Skip to content

Point 3rdparty to master - #2896

Merged
rullzer merged 1 commit into
masterfrom
3rdparty_master
Jan 2, 2017
Merged

Point 3rdparty to master#2896
rullzer merged 1 commit into
masterfrom
3rdparty_master

Conversation

@rullzer

@rullzerrullzer commented Dec 30, 2016

Copy link
Copy Markdown
Member

@rullzerrullzer added the 3. to review Waiting for reviews label Dec 30, 2016
@rullzerrullzer added this to the Nextcloud 12.0 milestone Dec 30, 2016
@rullzer

Copy link
Copy Markdown
MemberAuthor

Seems nextcloud/3rdparty#28 went against master. So it did some weird mergin.

@rullzer

Copy link
Copy Markdown
MemberAuthor

Needs a rebase but first lets fix 3rdparty.
@LukasReschke if you are bored. Else I'll look into it monday.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
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.

1 participant

@rullzer