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.

Sign up for GitHub

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

Jump to bottom

Point 3rdparty to master #2896

Merged
merged 1 commit into from
Jan 2, 2017
Merged

Point 3rdparty to master #2896

merged 1 commit into from
Jan 2, 2017

Conversation

rullzer
Copy link
Member

@rullzer rullzer commented Dec 30, 2016 •
edited
Loading

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

rullzer commented Dec 30, 2016

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

@rullzer
Copy link
Member Author

rullzer commented Dec 30, 2016

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

@rullzer
Point 3rdparty to master
19086ff 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer rullzer merged commit 17d2b25 into master Jan 2, 2017
@rullzer rullzer deleted the 3rdparty_master branch January 2, 2017 12:59
This was referenced Mar 30, 2021
Open
Open
Open
Open
Open
@snyk-bot snyk-bot mentioned this pull request Apr 16, 2021
Open
@snyk-bot snyk-bot mentioned this pull request Jun 15, 2021
Merged
@snyk-bot snyk-bot mentioned this pull request Oct 7, 2022
Open
@TomG736 TomG736 mentioned this pull request Oct 8, 2022
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
3. to review Waiting for reviews
Projects
None yet
Milestone
Nextcloud 12.0
Development

Successfully merging this pull request may close these issues.
1 participant
@rullzer