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

http -> https #1568

Merged
merged 14 commits into from
Dec 5, 2017
Merged

http -> https #1568

merged 14 commits into from
Dec 5, 2017

Conversation

supertobi
Copy link
Contributor

@houz
Copy link
Member

houz commented Dec 5, 2017

Thanks for going through these. There are some merge conflicts, could you resolve those please? I will merge then.

@supertobi
Copy link
Contributor Author

First time I've resolved merge conflicts in github. I hope it's OK.

@houz houz merged commit 18a2f40 into darktable-org:master Dec 5, 2017
@LebedevRI LebedevRI added this to the 2.4 milestone Dec 22, 2017
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
None yet
Projects
None yet
Milestone
2.4
Development

Successfully merging this pull request may close these issues.
3 participants
@supertobi @houz @LebedevRI